[ViewVC] Diff of: cvs/deliantra/server/server/player.C

Comparing deliantra/server/server/player.C (file contents):
Revision 1.83 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 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	#include <pwd.h>	26	#include <pwd.h>
26	#include <sproto.h>	27	#include <sproto.h>
27	#include <sounds.h>	28	#include <sounds.h>
31	#include <skills.h>	32	#include <skills.h>
32		33
33	#include <algorithm>	34	#include <algorithm>
34	#include <functional>	35	#include <functional>
35		36
36	player *	37	playervec players;
37	find_player (const char *plname)
38	{
39	for_all_players (pl)
40	if (pl->ob && !strcmp (query_name (pl->ob), plname))
41	return pl;
42
43	return 0;
44	}
45		38
46	void	39	void
47	display_motd (const object *op)	40	display_motd (const object *op)
48	{	41	{
49	char buf[MAX_BUF];	42	char buf[MAX_BUF];
…		…
123		116
124	news[0] = '\0';	117	news[0] = '\0';
125	subject[0] = '\0';	118	subject[0] = '\0';
126	size = 0;	119	size = 0;
127		120
128	while (fgets (buf, MAX_BUF, fp) != NULL)	121	while (fgets (buf, MAX_BUF, fp))
129	{	122	{
130	if (*buf == '#')	123	if (*buf == '#')
131	continue;	124	continue;
132		125
133	if (*buf == '%')	126	if (*buf == '%')
134	{ /* send one news */	127	{ /* send one news */
135	if (size > 0)	128	if (size > 0)
136	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
137	strcpy (subject, buf + 1);	131	strcpy (subject, buf + 1);
138	strip_endline (subject);	132	strip_endline (subject);
139	size = 0;	133	size = 0;
140	news[0] = '\0';	134	news[0] = '\0';
141	}	135	}
…		…
150	size += strlen (buf);	144	size += strlen (buf);
151	}	145	}
152	}	146	}
153		147
154	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,	148	draw_ext_info_format (NDI_UNIQUE \| NDI_GREEN, 0, op,
155	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);
156	close_and_delete (fp, comp);	150	close_and_delete (fp, comp);
157	}	151	}
158		152
159	/* This loads the first map an puts the player on it. */	153	/* This loads the first map an puts the player on it. */
160	static void	154	static void
…		…
176	ob->enter_exit (tmp);	170	ob->enter_exit (tmp);
177		171
178	tmp->destroy ();	172	tmp->destroy ();
179	}	173	}
180		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
181	// connect the player with a specific client	213	// connect the player with a specific client
182	// also changed, rationalises, and fixes some incorrect settings	214	// also changed, rationalises, and fixes some incorrect settings
183	void	215	void
184	player::connect (client *ns)	216	player::connect (client *ns)
185	{	217	{
186	this->ns = ns;	218	this->ns = ns;
187	ns->pl = this;	219	ns->pl = this;
188		220
189	next = first_player;	221	run_on = 0;
190	first_player = this;	222	fire_on = 0;
		223	ob->close_container (); //TODO: client-specific
191		224
192	ns->update_look = 0;	225	ns->update_look = 0;
193	ns->look_position = 0;	226	ns->look_position = 0;
194		227
195	clear_los (ob);	228	clear_los (ob);
		229
		230	ns->reset_stats ();
196		231
197	/* make sure he's a player -- needed because of class change. */	232	/* make sure he's a player -- needed because of class change. */
198	ob->type = PLAYER; // we are paranoid	233	ob->type = PLAYER; // we are paranoid
199	ob->race = ob->arch->clone.race;	234	ob->race = ob->arch->clone.race;
200		235
…		…
205	link_player_skills (ob);	240	link_player_skills (ob);
206		241
207	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208		243
209	assign (title, ob->arch->clone.name);	244	assign (title, ob->arch->clone.name);
210
211	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
212	* from the class, and not race. I don't see any way to get the class information
213	* to then update this. I don't think this will actually break anything - anyone
214	* that can use armour should be able to use a shield. What this may 'break'
215	* are features new characters get, eg, if someone starts up with a Q, they
216	* should be able to use a shield. However, old Q's won't get that advantage.
217	*/
218	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219	SET_FLAG (ob, FLAG_USE_SHIELD);
220		245
221	/* if it's a dragon player, set the correct title here */	246	/* if it's a dragon player, set the correct title here */
222	if (is_dragon_pl (ob))	247	if (is_dragon_pl (ob))
223	{	248	{
224	object tmp, abil = 0, *skin = 0;	249	object tmp, abil = 0, *skin = 0;
…		…
234	skin = tmp;	259	skin = tmp;
235		260
236	set_dragon_name (ob, abil, skin);	261	set_dragon_name (ob, abil, skin);
237	}	262	}
238		263
239	CLEAR_FLAG (ob, FLAG_FRIENDLY);
240	add_friendly_object (ob);
241
242	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245		265
246	esrv_new_player (this, ob->weight + ob->carrying);	266	esrv_new_player (this, ob->weight + ob->carrying);
247		267
248	ob->update_stats ();	268	ob->update_stats ();
249	ns->floorbox_update ();	269	ns->floorbox_update ();
250		270
251	esrv_send_inventory (ob, ob);	271	esrv_send_inventory (ob, ob);
252	esrv_add_spells (this, 0);	272	esrv_add_spells (this, 0);
253		273
254	ob->activate_recursive ();	274	activate ();
255	enter_map ();
256		275
257	send_rules (ob);	276	send_rules (ob);
258	send_news (ob);	277	send_news (ob);
259	display_motd (ob);	278	display_motd (ob);
260		279
…		…
263	}	282	}
264		283
265	void	284	void
266	player::disconnect ()	285	player::disconnect ()
267	{	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
268	if (ob)	299	if (ob)
269	ob->deactivate_recursive ();	300	ob->close_container (); //TODO: client-specific
270		301
271	//TODO: don't be so harsh and destroy :)	302	deactivate ();
272	if (ns)
273	{
274	if (enable_save)
275	{
276	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277	save (true);
278	}
279
280	INVOKE_PLAYER (DISCONNECT, this);
281
282	client *ns = this->ns;
283	ns->send_packet ("goodbye");
284	ns->flush ();
285	ns->pl = 0;
286	this->ns = 0;
287
288	ns->destroy ();
289	destroy ();
290	}
291	}	303	}
292		304
293	// the need for this function can be explained	305	// the need for this function can be explained
294	// by load_object not returning the object	306	// by load_object not returning the object
295	void	307	void
296	player::set_object (object *op)	308	player::set_object (object *op)
297	{	309	{
298	ob = op;	310	ob = op;
299	ob->contr = this; /* this aren't yet in archetype */	311	ob->contr = this; /* this aren't yet in archetype */
300		312
301	ob->speed_left = 0.5;	313	ob->speed_left = 0.5;
302	ob->speed = 1.0;	314	ob->speed = 1.0;
303	ob->direction = 5; /* So player faces south */	315	ob->direction = 5; /* So player faces south */
304	ob->stats.wc = 2;
305	ob->run_away = 25; /* Then we panick... */
306
307	ob->roll_stats ();
308	}	316	}
309		317
310	player::player ()	318	player::player ()
311	{	319	{
312	/* There are some elements we want initialised to non zero value -	320	/* There are some elements we want initialised to non zero value -
313	* we deal with that below this point.	321	* we deal with that below this point.
314	*/	322	*/
315	outputs_sync = 16; /* Every 2 seconds */	323	outputs_sync = 4;
316	outputs_count = 8; /* Keeps present behaviour */	324	outputs_count = 4;
317	unapply = unapply_nochoice;	325	unapply = unapply_nochoice;
318		326
319	savebed_map = first_map_path; /* Init. respawn position */	327	savebed_map = first_map_path; /* Init. respawn position */
320		328
321	gen_sp_armour = 10;	329	gen_sp_armour = 10;
322	last_speed = -1;
323	shoottype = range_none;	330	shoottype = range_none;
324	bowtype = bow_normal;	331	bowtype = bow_normal;
325	petmode = pet_normal;	332	petmode = pet_normal;
326	listening = 10;	333	listening = 10;
327	usekeys = containers;	334	usekeys = containers;
328	last_weapon_sp = -1;
329	peaceful = 1; /* default peaceful */	335	peaceful = 1; /* default peaceful */
330	do_los = 1;	336	do_los = 1;
331
332	/* we need to clear these to -1 and not zero - otherwise,
333	* if a player quits and starts a new character, we wont
334	* send new values to the client, as things like exp start
335	* at zero.
336	*/
337	for (int i = 0; i < NUM_SKILLS; i++)
338	last_skill_exp[i] = -1;
339
340	for (int i = 0; i < NROFATTACKS; i++)
341	last_resist[i] = -1;
342
343	last_stats.exp = -1;
344	last_weight = (uint32) - 1;
345	}	337	}
346		338
347	void	339	void
348	player::do_destroy ()	340	player::do_destroy ()
349	{	341	{
350	disconnect ();	342	disconnect ();
351		343
352	save (false);
353	enable_save = false;
354
355	attachable::do_destroy ();	344	attachable::do_destroy ();
356
357	terminate_all_pets (ob);
358
359	if (first_player != this)
360	{
361	player *prev = first_player;
362
363	while (prev && prev->next && prev->next != this)
364	prev = prev->next;
365
366	if (prev->next != this)
367	{
368	LOG (llevError, "Free_player: Can't find previous player.\n");
369	abort ();
370	}
371
372	prev->next = next;
373	}
374	else
375	first_player = next;
376		345
377	if (ob)	346	if (ob)
378	{	347	{
379	ob->destroy_inv (false);	348	ob->destroy_inv (false);
380	ob->destroy ();	349	ob->destroy ();
…		…
395	player::create ()	364	player::create ()
396	{	365	{
397	player *pl = new player;	366	player *pl = new player;
398		367
399	pl->set_object (arch_to_object (get_player_archetype (0)));	368	pl->set_object (arch_to_object (get_player_archetype (0)));
		369
		370	pl->ob->roll_stats ();
		371	pl->ob->stats.wc = 2;
		372	pl->ob->run_away = 25; /* Then we panick... */
		373
400	set_first_map (pl->ob);	374	set_first_map (pl->ob);
401		375
402	return pl;	376	return pl;
403	}	377	}
404		378
…		…
436	object *op = NULL;	410	object *op = NULL;
437	objectlink *ol;	411	objectlink *ol;
438	unsigned lastdist;	412	unsigned lastdist;
439	rv_vector rv;	413	rv_vector rv;
440		414
441	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	415	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442	{	416	{
443	/* 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
444	* does periodically happen. Given that, lets deal with it.	418	* does periodically happen. Given that, lets deal with it.
445	* While unlikely, it is possible the next object on the friendly	419	* While unlikely, it is possible the next object on the friendly
446	* list is also free, so encapsulate this in a while loop.	420	* list is also free, so encapsulate this in a while loop.
…		…
450	object *tmp = ol->ob;	424	object *tmp = ol->ob;
451		425
452	/* 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
453	* itself will have been cleared.	427	* itself will have been cleared.
454	*/	428	*/
455	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 ());
456	ol = ol->next;	431	ol = ol->next;
457	remove_friendly_object (tmp);	432	remove_friendly_object (tmp);
458	if (!ol)	433	if (!ol)
459	return op;	434	return op;
460	}	435	}
…		…
549	x = mon->x;	524	x = mon->x;
550	y = mon->y;	525	y = mon->y;
551	m = mon->map;	526	m = mon->map;
552	dir = rv.direction;	527	dir = rv.direction;
553	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 */
554	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
555	/* 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. */
556	if (diff > max)	532	if (diff > max)
557	return 0;	533	return 0;
		534
558	while (diff > 1 && max > 0)	535	while (diff > 1 && max > 0)
559	{	536	{
560	lastx = x;	537	lastx = x;
561	lasty = y;	538	lasty = y;
562	lastmap = m;	539	lastmap = m;
…		…
644	max--;	621	max--;
645	lastdir = dir;	622	lastdir = dir;
646	if (!firstdir)	623	if (!firstdir)
647	firstdir = dir;	624	firstdir = dir;
648	}	625	}
		626
649	if (diff <= 1)	627	if (diff <= 1)
650	{	628	{
651	/* Recalculate diff (distance) because we may not have actually	629	/* Recalculate diff (distance) because we may not have actually
652	* headed toward player for entire distance.	630	* headed toward player for entire distance.
653	*/	631	*/
654	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655	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));
656	}	634	}
		635
657	if (diff > max)	636	if (diff > max)
658	return 0;	637	return 0;
659	}	638	}
		639
660	/* 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 */
661	if (!max)	641	if (!max)
662	return 0;	642	return 0;
663		643
664	return firstdir;	644	return firstdir;
…		…
778	roll_stat (void)	758	roll_stat (void)
779	{	759	{
780	int a[4], i, j, k;	760	int a[4], i, j, k;
781		761
782	for (i = 0; i < 4; i++)	762	for (i = 0; i < 4; i++)
783	a[i] = (int) RANDOM () % 6 + 1;	763	a[i] = (int) rndm (6) + 1;
784		764
785	for (i = 0, j = 0, k = 7; i < 4; i++)	765	for (i = 0, j = 0, k = 7; i < 4; i++)
786	if (a[i] < k)	766	if (a[i] < k)
787	k = a[i], j = i;	767	k = a[i], j = i;
788		768
…		…
888	* appropriate action with it (change race, or other things).	868	* appropriate action with it (change race, or other things).
889	* The function name is for historical reasons - now we have	869	* The function name is for historical reasons - now we have
890	* separate race and class; this actually changes the RACE,	870	* separate race and class; this actually changes the RACE,
891	* not the class.	871	* not the class.
892	*/	872	*/
893	int	873	void
894	key_change_class (object *op, char key)	874	player::chargen_race_done ()
895	{	875	{
896	int tmp_loop;
897
898	if (key == 'd' \|\| key == 'D')
899	{
900	char buf[MAX_BUF];
901
902	/* this must before then initial items are given */	876	/* this must before then initial items are given */
903	esrv_new_player (op->contr, op->weight + op->carrying);	877	esrv_new_player (ob->contr, ob->weight + ob->carrying);
904		878
905	treasurelist *tl = find_treasurelist ("starting_wealth");	879	treasurelist *tl = treasurelist::find ("starting_wealth");
906	if (tl)	880	if (tl)
907	create_treasure (tl, op, 0, 0, 0);	881	create_treasure (tl, ob, 0, 0, 0);
908		882
909	INVOKE_PLAYER (BIRTH, op->contr);	883	INVOKE_PLAYER (BIRTH, ob->contr);
910	INVOKE_PLAYER (LOGIN, op->contr);	884	INVOKE_PLAYER (LOGIN, ob->contr);
911		885
912	op->contr->ns->state = ST_PLAYING;	886	ob->contr->ns->state = ST_PLAYING;
913		887
914	if (op->msg)	888	if (ob->msg)
915	op->msg = NULL;	889	ob->msg = 0;
916		890
917	/* 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
918	* to save here.	892	* to save here.
919	*/	893	*/
		894	{
		895	char buf[MAX_BUF];
920	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	896	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921	make_path_to_file (buf);	897	make_path_to_file (buf);
		898	}
922		899
923	#ifdef AUTOSAVE
924	op->contr->last_save_tick = pticks;
925	#endif
926	start_info (op);	900	start_info (ob);
927	CLEAR_FLAG (op, FLAG_WIZ);	901	CLEAR_FLAG (ob, FLAG_WIZ);
928	give_initial_items (op, op->randomitems);	902	give_initial_items (ob, ob->randomitems);
929	link_player_skills (op);	903	link_player_skills (ob);
930	esrv_send_inventory (op, op);	904	esrv_send_inventory (ob, ob);
931	op->update_stats ();	905	ob->update_stats ();
932		906
933	/* This moves the player to a different start map, if there	907	/* This moves the player to a different start map, if there
934	* is one for this race	908	* is one for this race
935	*/	909	*/
936	if (*first_map_ext_path)	910	if (*first_map_ext_path)
937	{	911	{
938	object *tmp;	912	object *tmp;
939	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
940		914
941	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);
942	tmp = object::create ();	916	tmp = object::create ();
943	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
944	EXIT_X (tmp) = op->x;	918	EXIT_X (tmp) = ob->x;
945	EXIT_Y (tmp) = op->y;	919	EXIT_Y (tmp) = ob->y;
946	op->enter_exit (tmp); /* we don't really care if it succeeded;	920	ob->enter_exit (tmp); /* we don't really care if it succeeded;
947	* if the map isn't there, then stay on the	921	* if the map isn't there, then stay on the
948	* default initial map */	922	* default initial map */
949	tmp->destroy ();	923	tmp->destroy ();
950	}	924	}
951	else	925	else
952	LOG (llevDebug, "first_map_ext_path not set\n");	926	LOG (llevDebug, "first_map_ext_path not set\n");
		927	}
953		928
954	return 0;	929	void
955	}	930	player::chargen_race_next ()
956		931	{
957	/* Following actually changes the race - this is the default command	932	/* Following actually changes the race - this is the default command
958	* if we don't match with one of the options above.	933	* if we don't match with one of the options above.
959	*/	934	*/
960		935
961	tmp_loop = 0;	936	do
962	while (!tmp_loop)
963	{	937	{
964	shstr name = op->name;	938	shstr name = ob->name;
965	int x = op->x, y = op->y;	939	int x = ob->x, y = ob->y;
966		940
967	op->remove_statbonus ();	941	ob->remove_statbonus ();
968	op->remove ();	942	ob->remove ();
969	op->arch = get_player_archetype (op->arch);	943	ob->arch = get_player_archetype (ob->arch);
970	op->arch->clone.copy_to (op);	944	ob->arch->clone.copy_to (ob);
971	op->instantiate ();	945	ob->instantiate ();
972	op->stats = op->contr->orig_stats;	946	ob->stats = ob->contr->orig_stats;
973	op->name = op->name_pl = name;	947	ob->name = ob->name_pl = name;
974	op->x = x;	948	ob->x = x;
975	op->y = y;	949	ob->y = y;
976	SET_ANIMATION (op, 2); /* So player faces south */	950	SET_ANIMATION (ob, 2); /* So player faces south */
977	insert_ob_in_map (op, op->map, op, 0);	951	insert_ob_in_map (ob, ob->map, ob, 0);
978	assign (op->contr->title, op->arch->clone.name);	952	assign (ob->contr->title, ob->arch->clone.name);
979	op->add_statbonus ();	953	ob->add_statbonus ();
980	tmp_loop = allowed_class (op);
981	}	954	}
		955	while (!allowed_class (ob));
982		956
983	update_object (op, UP_OBJ_FACE);	957	update_object (ob, UP_OBJ_FACE);
984	esrv_update_item (UPD_FACE, op, op);	958	esrv_update_item (UPD_FACE, ob, ob);
985	op->update_stats ();	959	ob->update_stats ();
986	op->stats.hp = op->stats.maxhp;	960	ob->stats.hp = ob->stats.maxhp;
987	op->stats.sp = op->stats.maxsp;	961	ob->stats.sp = ob->stats.maxsp;
988	op->stats.grace = 0;	962	ob->stats.grace = 0;
989
990	if (op->msg)
991	new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994	return 0;
995	}
996
997	int
998	key_confirm_quit (object *op, char key)
999	{
1000	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001	{
1002	op->contr->ns->state = ST_PLAYING;
1003	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004	return 1;
1005	}
1006
1007	INVOKE_PLAYER (LOGOUT, op->contr);
1008	INVOKE_PLAYER (QUIT, op->contr);
1009
1010	op->contr->enable_save = false;
1011
1012	terminate_all_pets (op);
1013	op->remove ();
1014	op->direction = 0;
1015	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1016
1017	strcpy (op->contr->killer, "quit");
1018	check_score (op);
1019	op->contr->party = 0;
1020	op->contr->own_title[0] = '\0';
1021	op->contr->destroy ();
1022
1023	return 1;
1024	}	963	}
1025		964
1026	void	965	void
1027	flee_player (object *op)	966	flee_player (object *op)
1028	{	967	{
…		…
1085	int	1024	int
1086	check_pick (object *op)	1025	check_pick (object *op)
1087	{	1026	{
1088	object tmp, next;	1027	object tmp, next;
1089	int stop = 0;	1028	int stop = 0;
1090	int j, k, wvratio;	1029	int wvratio;
1091	char putstring[128], tmpstr[16];	1030	char putstring[128];
1092		1031
1093	/* if you're flying, you cna't pick up anything */	1032	/* if you're flying, you cna't pick up anything */
1094	if (op->move_type & MOVE_FLYING)	1033	if (op->move_type & MOVE_FLYING)
1095	return 1;	1034	return 1;
1096		1035
…		…
1433	* found object is returned.	1372	* found object is returned.
1434	*/	1373	*/
1435	object *	1374	object *
1436	find_arrow (object op, const char type)	1375	find_arrow (object op, const char type)
1437	{	1376	{
1438	object *tmp = NULL;	1377	object *tmp = 0;
1439		1378
1440	for (op = op->inv; op; op = op->below)	1379	for (op = op->inv; op; op = op->below)
1441	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))
1442	tmp = find_arrow (op, type);	1381	tmp = find_arrow (op, type);
1443	else if (op->type == ARROW && op->race == type)	1382	else if (op->type == ARROW && op->race == type)
1444	return op;	1383	return op;
		1384
1445	return tmp;	1385	return tmp;
1446	}	1386	}
1447		1387
1448	/*	1388	/*
1449	* 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
1450	* 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
1451	* 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
1452	* 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.
1453	*/	1393	*/
1454
1455	object *	1394	object *
1456	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)
1457	{	1396	{
1458	object tmp = NULL, arrow, *ntmp;	1397	object tmp = NULL, arrow, *ntmp;
1459	int attacknum, attacktype, betterby = 0, i;	1398	int attacknum, attacktype, betterby = 0, i;
…		…
1651	if (op->type == PLAYER)	1590	if (op->type == PLAYER)
1652	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);
1653	/* 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 */
1654	else	1593	else
1655	CLEAR_FLAG (op, FLAG_READY_BOW);	1594	CLEAR_FLAG (op, FLAG_READY_BOW);
		1595
1656	return 0;	1596	return 0;
1657	}	1597	}
1658	}	1598	}
1659		1599
1660	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1600	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1691	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1631	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1692	op->update_stats ();	1632	op->update_stats ();
1693	}	1633	}
1694		1634
1695	SET_ANIMATION (arrow, arrow->direction);	1635	SET_ANIMATION (arrow, arrow->direction);
		1636
1696	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1637	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1697	arrow->stats.hp = arrow->stats.dam;	1638	arrow->stats.hp = arrow->stats.dam;
1698	arrow->stats.grace = arrow->attacktype;	1639	arrow->stats.grace = arrow->attacktype;
		1640
1699	if (arrow->slaying != NULL)	1641	if (arrow->slaying)
1700	arrow->spellarg = strdup (arrow->slaying);	1642	arrow->spellarg = strdup (arrow->slaying);
1701		1643
1702	/* Note that this was different for monsters - they got their level	1644	arrow->stats.dam += op->stats.dam + arrow->magic;
1703	* added to the damage. I think the strength bonus is more proper.
1704	*/
1705
1706	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1707		1645
1708	/* update the speed */	1646	/* update the speed */
1709	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1647	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1710	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;
1711		1649
1712	arrow->set_speed (max (arrow->speed, 1.0));	1650	arrow->set_speed (max (arrow->speed, 1.0));
1713	arrow->speed_left = 0;	1651	arrow->speed_left = 0;
1714		1652
		1653	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1654
1715	if (op->type == PLAYER)	1655	if (op->type == PLAYER)
1716	{	1656	{
1717	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1718	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1719	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1720
1721	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;
1722	}	1662	}
1723	else	1663	else
1724	{	1664	{
1725	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1726	arrow->level = op->level;	1665	arrow->level = op->level;
1727	}	1666	arrow->stats.wc -= bow->magic;
1728		1667
1729	if (arrow->attacktype == AT_PHYSICAL)	1668	if (!arrow->slaying)
		1669	arrow->slaying = bow->slaying;
		1670	}
		1671
		1672	arrow->stats.wc -= arrow->level;
		1673
1730	arrow->attacktype \|= bow->attacktype;	1674	arrow->attacktype \|= bow->attacktype;
1731
1732	if (bow->slaying)
1733	arrow->slaying = bow->slaying;
1734		1675
1735	arrow->move_type = MOVE_FLY_LOW;	1676	arrow->move_type = MOVE_FLY_LOW;
1736	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1677	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1737		1678
1738	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);
…		…
1891	case range_misc:	1832	case range_misc:
1892	fire_misc_object (op, dir);	1833	fire_misc_object (op, dir);
1893	return;	1834	return;
1894		1835
1895	case range_golem: /* Control summoned monsters from scrolls */	1836	case range_golem: /* Control summoned monsters from scrolls */
1896	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1897	{
1898	op->contr->ranges[range_golem] = 0;
1899	op->contr->shoottype = range_none;
1900	}
1901	else
1902	control_golem (op->contr->ranges[range_golem], dir);	1837	control_golem (op->contr->ranges[range_golem], dir);
1903	return;	1838	return;
1904		1839
1905	case range_skill:	1840	case range_skill:
1906	if (!op->chosen_skill)	1841	if (!op->chosen_skill)
1907	{	1842	{
1908	if (op->type == PLAYER)	1843	if (op->type == PLAYER)
1909	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
1910	return;	1846	return;
1911	}	1847	}
		1848
1912	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1849	do_skill (op, op, op->chosen_skill, dir, NULL);
1913	return;	1850	return;
1914	case range_builder:	1851	case range_builder:
1915	apply_map_builder (op, dir);	1852	apply_map_builder (op, dir);
1916	return;	1853	return;
1917	default:	1854	default:
1918	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");	1855	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1919	return;	1856	return;
1920	}	1857	}
1921	}	1858	}
1922
1923
1924		1859
1925	/* find_key	1860	/* find_key
1926	* 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
1927	* and successfully use it, we return the key, otherwise NULL	1862	* and successfully use it, we return the key, otherwise NULL
1928	* This function merges both normal and locked door, since the logic	1863	* This function merges both normal and locked door, since the logic
…		…
1930	* pl is the player,	1865	* pl is the player,
1931	* inv is the objects inventory to searched	1866	* inv is the objects inventory to searched
1932	* door is the door we are trying to match against.	1867	* door is the door we are trying to match against.
1933	* This function can be called recursively to search containers.	1868	* This function can be called recursively to search containers.
1934	*/	1869	*/
1935
1936	object *	1870	object *
1937	find_key (object pl, object container, object *door)	1871	find_key (object pl, object container, object *door)
1938	{	1872	{
1939	object tmp, key;	1873	object tmp, key;
1940		1874
1941	/* Should not happen, but sanity checking is never bad */	1875	/* Should not happen, but sanity checking is never bad */
1942	if (container->inv == NULL)	1876	if (!container->inv)
1943	return NULL;	1877	return 0;
1944		1878
1945	/* 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 */
1946	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1880	for (tmp = container->inv; tmp; tmp = tmp->below)
1947	{	1881	{
1948	if (door->type == DOOR && tmp->type == KEY)	1882	if (door->type == DOOR && tmp->type == KEY)
1949	break;	1883	break;
1950	/* For sanity, we should really check door type, but other stuff	1884	/* For sanity, we should really check door type, but other stuff
1951	* (like containers) can be locked with special keys	1885	* (like containers) can be locked with special keys
1952	*/	1886	*/
1953	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1887	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1954	break;	1888	break;
1955	}	1889	}
		1890
1956	/* No key found - lets search inventories now */	1891	/* No key found - lets search inventories now */
1957	/* 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.
1958	* 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
1959	* a key, return	1894	* a key, return
1960	*/	1895	*/
1961	if (!tmp)	1896	if (!tmp)
1962	{	1897	{
1963	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1898	for (tmp = container->inv; tmp; tmp = tmp->below)
1964	{	1899	{
1965	/* No reason to search empty containers */	1900	/* No reason to search empty containers */
1966	if (tmp->type == CONTAINER && tmp->inv)	1901	if (tmp->type == CONTAINER && tmp->inv)
1967	{	1902	{
1968	if ((key = find_key (pl, tmp, door)) != NULL)	1903	if ((key = find_key (pl, tmp, door)))
1969	return key;	1904	return key;
1970	}	1905	}
1971	}	1906	}
		1907
1972	if (!tmp)	1908	if (!tmp)
1973	return NULL;	1909	return NULL;
1974	}	1910	}
		1911
1975	/* 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,
1976	* see if we actually want to use it	1913	* see if we actually want to use it
1977	*/	1914	*/
1978	if (pl != container)	1915	if (pl != container)
1979	{	1916	{
…		…
2000	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1937	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
2001	"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));
2002	return NULL;	1939	return NULL;
2003	}	1940	}
2004	}	1941	}
		1942
2005	return tmp;	1943	return tmp;
2006	}	1944	}
2007		1945
2008	/* moved door processing out of move_player_attack.	1946	/* moved door processing out of move_player_attack.
2009	* returns 1 if player has opened the door with a key	1947	* returns 1 if player has opened the door with a key
…		…
2027	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);
2028	if (action_makes_visible (op))	1966	if (action_makes_visible (op))
2029	make_visible (op);	1967	make_visible (op);
2030	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1968	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
2031	spring_trap (door->inv, op);	1969	spring_trap (door->inv, op);
		1970
2032	if (door->type == DOOR)	1971	if (door->type == DOOR)
2033	{
2034	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1972	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2035	}
2036	else if (door->type == LOCKED_DOOR)	1973	else if (door->type == LOCKED_DOOR)
2037	{	1974	{
2038	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1975	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2039	remove_door2 (door); /* remove door without violence ;-) */	1976	remove_door2 (door); /* remove door without violence ;-) */
2040	}	1977	}
		1978
2041	/* Do this after we print the message */	1979	/* Do this after we print the message */
2042	decrease_ob (key); /* Use up one of the keys */	1980	decrease_ob (key); /* Use up one of the keys */
2043	/* Need to update the weight the container the key was in */	1981	/* Need to update the weight the container the key was in */
2044	if (container != op)	1982	if (container != op)
2045	esrv_update_item (UPD_WEIGHT, op, container);	1983	esrv_update_item (UPD_WEIGHT, op, container);
		1984
2046	return 1; /* Nothing more to do below */	1985	return 1; /* Nothing more to do below */
2047	}	1986	}
2048	else if (door->type == LOCKED_DOOR)	1987	else if (door->type == LOCKED_DOOR)
2049	{	1988	{
2050	/* Might as well return now - no other way to open this */	1989	/* Might as well return now - no other way to open this */
2051	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	1990	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2052	return 1;	1991	return 1;
2053	}	1992	}
		1993
2054	return 0;	1994	return 0;
2055	}	1995	}
2056		1996
2057	/* This function is just part of a breakup from move_player.	1997	/* This function is just part of a breakup from move_player.
2058	* It should keep the code cleaner.	1998	* It should keep the code cleaner.
…		…
2084	*/	2024	*/
2085	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2025	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2086	{	2026	{
2087	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2027	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2088	{	2028	{
2089	m = get_map_from_coord (op->map, &nx, &ny);	2029	m = op->map->xy_find (nx, ny);
2090	if (!m)	2030	if (!m)
2091	return; /* Don't think this should happen */	2031	return; /* Don't think this should happen */
2092	}	2032	}
2093	else	2033	else
2094	m = op->map;	2034	m = op->map;
2095		2035
2096	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2036	if (!(tmp = m->at (nx, ny).bot))
2097	{
2098	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2099	return;	2037	return;
2100	}
2101		2038
2102	mon = 0;	2039	mon = 0;
2103	/* Go through all the objects, and find ones of interest. Only stop if	2040	/* Go through all the objects, and find ones of interest. Only stop if
2104	* we find a monster - that is something we know we want to attack.	2041	* we find a monster - that is something we know we want to attack.
2105	* if its a door or barrel (can roll) see if there may be monsters	2042	* if its a door or barrel (can roll) see if there may be monsters
…		…
2158	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2159	{	2096	{
2160	/* If we're braced, we don't want to switch places with it */	2097	/* If we're braced, we don't want to switch places with it */
2161	if (op->contr->braced)	2098	if (op->contr->braced)
2162	return;	2099	return;
		2100
2163	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2101	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2164	(void) push_ob (mon, dir, op);	2102	(void) push_ob (mon, dir, op);
2165	if (op->contr->tmp_invis \|\| op->hide)	2103	if (op->contr->tmp_invis \|\| op->hide)
2166	make_visible (op);	2104	make_visible (op);
		2105
2167	return;	2106	return;
2168	}	2107	}
2169		2108
2170	/* in certain circumstances, you shouldn't attack friendly	2109	/* in certain circumstances, you shouldn't attack friendly
2171	* creatures. Note that if you are braced, you can't push	2110	* creatures. Note that if you are braced, you can't push
…		…
2185	!on_battleground))	2124	!on_battleground))
2186	{	2125	{
2187	if (!op->contr->braced)	2126	if (!op->contr->braced)
2188	{	2127	{
2189	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2128	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190	(void) push_ob (mon, dir, op);	2129	push_ob (mon, dir, op);
2191	}	2130	}
2192	else	2131	else
2193	new_draw_info (0, 0, op, "You withhold your attack");	2132	new_draw_info (0, 0, op, "You withhold your attack");
2194		2133
2195	if (op->contr->tmp_invis \|\| op->hide)	2134	if (op->contr->tmp_invis \|\| op->hide)
…		…
2210	* Way it works is like this: First, it must have some hit points	2149	* Way it works is like this: First, it must have some hit points
2211	* and be living. Then, it must be one of the following:	2150	* and be living. Then, it must be one of the following:
2212	* 1) Not a player, 2) A player, but of a different party. Note	2151	* 1) Not a player, 2) A player, but of a different party. Note
2213	* that party_number -1 is no party, so attacks can still happen.	2152	* that party_number -1 is no party, so attacks can still happen.
2214	*/	2153	*/
2215
2216	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2154	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2217	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2155	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2218	{	2156	{
2219		2157
2220	/* If the player hasn't hit something this tick, and does	2158	/* If the player hasn't hit something this tick, and does
…		…
2254	int	2192	int
2255	move_player (object *op, int dir)	2193	move_player (object *op, int dir)
2256	{	2194	{
2257	int pick;	2195	int pick;
2258		2196
2259	if (op->map == NULL \|\| op->map->in_memory != MAP_IN_MEMORY)	2197	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
2260	return 0;	2198	return 0;
2261		2199
2262	/* Sanity check: make sure dir is valid */	2200	/* Sanity check: make sure dir is valid */
2263	if ((dir < 0) \|\| (dir >= 9))	2201	if ((dir < 0) \|\| (dir >= 9))
2264	{	2202	{
2265	LOG (llevError, "move_player: invalid direction %d\n", dir);	2203	LOG (llevError, "move_player: invalid direction %d\n", dir);
2266	return 0;	2204	return 0;
2267	}	2205	}
2268		2206
2269	/* peterm: added following line */	2207	/* peterm: added following line */
2270	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2208	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2271	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2209	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2272		2210
2273	op->facing = dir;	2211	op->facing = dir;
2274		2212
2275	if (op->hide)	2213	if (op->hide)
2276	do_hidden_move (op);	2214	do_hidden_move (op);
…		…
2309	* Returns true if there are more actions we can do.	2247	* Returns true if there are more actions we can do.
2310	*/	2248	*/
2311	int	2249	int
2312	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2313	{	2251	{
2314	if (op->contr->hidden)
2315	{
2316	op->invisible = 1000;
2317	/* the socket code flashes the player visible/invisible
2318	* depending on the value of invisible, so we need to
2319	* alternate it here for it to work correctly.
2320	*/
2321	if (pticks & 2)
2322	op->invisible--;
2323	}
2324	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2325	{
2326	op->invisible--;
2327	if (!op->invisible)
2328	{
2329	make_visible (op);
2330	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2331	}
2332	}
2333
2334	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2335	{	2253	{
2336	flee_player (op);	2254	flee_player (op);
2337	/* If player is still scared, that is his action for this tick */	2255	/* If player is still scared, that is his action for this tick */
2338	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2339	{	2257	{
2340	op->speed_left--;	2258	op->speed_left--;
2341	return 0;	2259	return 0;
2342	}	2260	}
2343	}	2261	}
2344
2345	/* I've been seeing crashes where the golem has been destroyed, but
2346	* the player object still points to the defunct golem. The code that
2347	* destroys the golem looks correct, and it doesn't always happen, so
2348	* put this in a a workaround to clean up the golem pointer.
2349	*/
2350	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2351	op->contr->ranges[range_golem] = 0;
2352		2262
2353	/* call this here - we also will call this in do_ericserver, but	2263	/* call this here - we also will call this in do_ericserver, but
2354	* the players time has been increased when doericserver has been	2264	* the players time has been increased when doericserver has been
2355	* called, so we recheck it here.	2265	* called, so we recheck it here.
2356	*/	2266	*/
…		…
2417	* from.	2327	* from.
2418	*/	2328	*/
2419	void	2329	void
2420	remove_unpaid_objects (object op, object env)	2330	remove_unpaid_objects (object op, object env)
2421	{	2331	{
2422	object *next;
2423
2424	while (op)	2332	while (op)
2425	{	2333	{
2426	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */	2334	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2427		2335
2428	if (QUERY_FLAG (op, FLAG_UNPAID))	2336	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2494	int rate_grace = 2000;	2402	int rate_grace = 2000;
2495	const int max_hp = 1;	2403	const int max_hp = 1;
2496	const int max_sp = 1;	2404	const int max_sp = 1;
2497	const int max_grace = 1;	2405	const int max_grace = 1;
2498		2406
2499	if (op->contr->outputs_sync)	2407	if (op->contr->hidden)
		2408	{
		2409	op->invisible = 1000;
		2410	/* the socket code flashes the player visible/invisible
		2411	* depending on the value of invisible, so we need to
		2412	* alternate it here for it to work correctly.
		2413	*/
		2414	if (pticks & 2)
		2415	op->invisible--;
2500	{	2416	}
2501	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2417	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2502	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2418	{
2503	flush_output_element (op, &op->contr->outputs[i]);	2419	if (!op->invisible--)
		2420	{
		2421	make_visible (op);
		2422	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
		2423	}
2504	}	2424	}
2505		2425
2506	if (op->contr->ns->state == ST_PLAYING)	2426	if (op->contr->ns->state == ST_PLAYING)
2507	{	2427	{
2508	/* these next three if clauses make it possible to SLOW DOWN	2428	/* these next three if clauses make it possible to SLOW DOWN
…		…
2530	gen_grace = op->stats.maxgrace;	2450	gen_grace = op->stats.maxgrace;
2531	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2451	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2532	}	2452	}
2533		2453
2534	/* Regenerate Spell Points */	2454	/* Regenerate Spell Points */
2535	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2455	if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2536	{	2456	{
2537	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);	2457	gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2538	if (op->stats.sp < op->stats.maxsp)	2458	if (op->stats.sp < op->stats.maxsp)
2539	{	2459	{
2540	op->stats.sp++;	2460	op->stats.sp++;
…		…
2758	tmp->name = buf;	2678	tmp->name = buf;
2759	sprintf (buf, " This finger has been cut off %s\n"	2679	sprintf (buf, " This finger has been cut off %s\n"
2760	" the %s, when he was defeated at\n level %d by %s.\n",	2680	" the %s, when he was defeated at\n level %d by %s.\n",
2761	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2681	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2762	tmp->msg = buf;	2682	tmp->msg = buf;
2763	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2683	tmp->value = 0, tmp->type = 0;
2764	tmp->materialname = NULL;	2684	tmp->materialname = "organics";
2765	op->insert_at (tmp, op);	2685	tmp->insert_at (op, tmp);
2766	}	2686	}
2767		2687
2768	/* teleport defeated player to new destination */	2688	/* teleport defeated player to new destination */
2769	transfer_ob (op, x, y, 0, NULL);	2689	transfer_ob (op, x, y, 0, NULL);
2770	op->contr->braced = 0;	2690	op->contr->braced = 0;
…		…
2775		2695
2776	command_kill_pets (op, 0);	2696	command_kill_pets (op, 0);
2777		2697
2778	if (op->stats.food < 0)	2698	if (op->stats.food < 0)
2779	{	2699	{
2780	if (op->contr->explore)
2781	{
2782	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2783	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2784	op->stats.food = 999;
2785	return;
2786	}
2787	sprintf (buf, "%s starved to death.", &op->name);	2700	sprintf (buf, "%s starved to death.", &op->name);
2788	strcpy (op->contr->killer, "starvation");	2701	strcpy (op->contr->killer, "starvation");
2789	}	2702	}
2790	else	2703	else
2791	{
2792	if (op->contr->explore)
2793	{
2794	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2795	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2796	op->stats.hp = op->stats.maxhp;
2797	return;
2798	}
2799	sprintf (buf, "%s died.", &op->name);	2704	sprintf (buf, "%s died.", &op->name);
2800	}
2801		2705
2802	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2706	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2803		2707
2804	/* save the map location for corpse, gravestone */	2708	/* save the map location for corpse, gravestone */
2805	x = op->x;	2709	x = op->x;
…		…
2981	op->stats.hp = op->stats.maxhp;	2885	op->stats.hp = op->stats.maxhp;
2982	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2886	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2983	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2887	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2984		2888
2985	/*	2889	/*
2986	* Check to see if the player is in a shop. IF so, then check to see if
2987	* the player has any unpaid items. If so, remove them and put them back	2890	* Check to see if the player has any unpaid items. If so, remove them
2988	* in the map.	2891	* and put them back in the map.
2989	*/	2892	*/
2990
2991	if (is_in_shop (op))
2992	remove_unpaid_objects (op->inv, op);	2893	remove_unpaid_objects (op->inv, op);
2993		2894
2994	/****************************************/	2895	/****************************************/
2995	/* */	2896	/* */
2996	/* Move player to his current respawn- */	2897	/* Move player to his current respawn- */
2997	/* position (usually last savebed) */	2898	/* position (usually last savebed) */
2998	/* */	2899	/* */
2999	/****************************************/	2900	/****************************************/
3000		2901
3001	enter_player_savebed (op);	2902	enter_player_savebed (op);
3002		2903
3003	/* Save the player before inserting the force to reduce
3004	* chance of abuse.
3005	*/
3006	op->contr->braced = 0;	2904	op->contr->braced = 0;
3007	op->contr->save ();
3008		2905
3009	/* it is possible that the player has blown something up	2906	/* it is possible that the player has blown something up
3010	* at his savebed location, and that can have long lasting	2907	* at his savebed location, and that can have long lasting
3011	* spell effects. So first see if there is a spell effect	2908	* spell effects. So first see if there is a spell effect
3012	* on the space that might harm the player.	2909	* on the space that might harm the player.
…		…
3041	void	2938	void
3042	loot_object (object *op)	2939	loot_object (object *op)
3043	{ /* Grab and destroy some treasure */	2940	{ /* Grab and destroy some treasure */
3044	object tmp, tmp2, *next;	2941	object tmp, tmp2, *next;
3045		2942
3046	if (op->container)	2943	op->close_container (); /* close open sack first */
3047	esrv_apply_container (op, op->container); /* close open sack first */
3048		2944
3049	for (tmp = op->inv; tmp; tmp = next)	2945	for (tmp = op->inv; tmp; tmp = next)
3050	{	2946	{
3051	next = tmp->below;	2947	next = tmp->below;
3052		2948
3053	if (tmp->invisible)	2949	if (tmp->invisible)
3054	continue;	2950	continue;
3055		2951
3056	tmp->remove ();	2952	tmp->remove ();
3057	tmp->x = op->x, tmp->y = op->y;	2953	tmp->x = op->x, tmp->y = op->y;
		2954
3058	if (tmp->type == CONTAINER)	2955	if (tmp->type == CONTAINER)
3059	{ /* empty container to ground */	2956	loot_object (tmp); /* empty container to ground */
3060	loot_object (tmp);	2957
3061	}
3062	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(RANDOM () % 3)))	2958	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
3063	{	2959	{
3064	if (tmp->nrof > 1)	2960	if (tmp->nrof > 1)
3065	{	2961	{
3066	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2962	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3067	tmp2->destroy ();	2963	tmp2->destroy ();
…		…
3078	/*	2974	/*
3079	* fix_weight(): Check recursively the weight of all players, and fix	2975	* fix_weight(): Check recursively the weight of all players, and fix
3080	* what needs to be fixed. Refresh windows and fix speed if anything	2976	* what needs to be fixed. Refresh windows and fix speed if anything
3081	* was changed.	2977	* was changed.
3082	*/	2978	*/
3083
3084	void	2979	void
3085	fix_weight (void)	2980	fix_weight (void)
3086	{	2981	{
3087	for_all_players (pl)	2982	for_all_players (pl)
3088	{	2983	{
…		…
3148	if (op->type == PLAYER)	3043	if (op->type == PLAYER)
3149	{	3044	{
3150	op->contr->tmp_invis = 0;	3045	op->contr->tmp_invis = 0;
3151	op->contr->invis_race = 0;	3046	op->contr->invis_race = 0;
3152	}	3047	}
		3048
3153	update_object (op, UP_OBJ_FACE);	3049	update_object (op, UP_OBJ_CHANGE);
3154	}	3050	}
3155		3051
3156	int	3052	int
3157	is_true_undead (object *op)	3053	is_true_undead (object *op)
3158	{	3054	{
3159	object *tmp = NULL;
3160
3161	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3055	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3162	return 1;	3056	return 1;
3163		3057
3164	return 0;	3058	return 0;
3165	}	3059	}
…		…
3224		3118
3225	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3119	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3226		3120
3227	/* its extremely hard to run and sneak/hide at the same time! */	3121	/* its extremely hard to run and sneak/hide at the same time! */
3228	if (op->type == PLAYER && op->contr->run_on)	3122	if (op->type == PLAYER && op->contr->run_on)
3229	{
3230	if (!skop \|\| num >= skop->level)	3123	if (!skop \|\| num >= skop->level)
3231	{	3124	{
3232	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3125	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3233	make_visible (op);	3126	make_visible (op);
3234	return;	3127	return;
3235	}	3128	}
3236	else	3129	else
3237	num += 20;	3130	num += 20;
3238	}	3131
3239	num += op->map->difficulty;	3132	num += op->map->difficulty;
3240	hide = hideability (op); /* modify by terrain hidden level */	3133	hide = hideability (op); /* modify by terrain hidden level */
3241	num -= hide;	3134	num -= hide;
		3135
3242	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))	3136	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))
3243	{	3137	{
3244	make_visible (op);	3138	make_visible (op);
3245	if (op->type == PLAYER)	3139	if (op->type == PLAYER)
3246	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3140	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3247	}	3141	}
3248	else if (op->type == PLAYER && skop)	3142	else if (op->type == PLAYER && skop)
3249	{
3250	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3143	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3251	}
3252	}	3144	}
3253		3145
3254	/* determine if who is standing near a hostile creature. */	3146	/* determine if who is standing near a hostile creature. */
3255		3147
3256	int	3148	int
…		…
3455	char buf[MAX_BUF]; /* tmp. string buffer */	3347	char buf[MAX_BUF]; /* tmp. string buffer */
3456	int i = 0, j = 0;	3348	int i = 0, j = 0;
3457		3349
3458	/* get the appropriate treasurelist */	3350	/* get the appropriate treasurelist */
3459	if (atnr == ATNR_FIRE)	3351	if (atnr == ATNR_FIRE)
3460	trlist = find_treasurelist ("dragon_ability_fire");	3352	trlist = treasurelist::find ("dragon_ability_fire");
3461	else if (atnr == ATNR_COLD)	3353	else if (atnr == ATNR_COLD)
3462	trlist = find_treasurelist ("dragon_ability_cold");	3354	trlist = treasurelist::find ("dragon_ability_cold");
3463	else if (atnr == ATNR_ELECTRICITY)	3355	else if (atnr == ATNR_ELECTRICITY)
3464	trlist = find_treasurelist ("dragon_ability_elec");	3356	trlist = treasurelist::find ("dragon_ability_elec");
3465	else if (atnr == ATNR_POISON)	3357	else if (atnr == ATNR_POISON)
3466	trlist = find_treasurelist ("dragon_ability_poison");	3358	trlist = treasurelist::find ("dragon_ability_poison");
3467		3359
3468	if (trlist == NULL \|\| who->type != PLAYER)	3360	if (trlist == NULL \|\| who->type != PLAYER)
3469	return;	3361	return;
3470		3362
3471	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3363	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
…		…
3603	* not readied.	3495	* not readied.
3604	*/	3496	*/
3605	void	3497	void
3606	player_unready_range_ob (player pl, object ob)	3498	player_unready_range_ob (player pl, object ob)
3607	{	3499	{
3608	rangetype i;
3609
3610	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3500	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3611	{
3612	if (pl->ranges[i] == ob)	3501	if (pl->ranges[i] == ob)
3613	{	3502	{
3614	pl->ranges[i] = NULL;	3503	pl->ranges[i] = 0;
3615	if (pl->shoottype == i)	3504	if (pl->shoottype == i)
3616	{
3617	pl->shoottype = range_none;	3505	pl->shoottype = range_none;
3618	}
3619	}	3506	}
3620	}
3621	}	3507	}
		3508
		3509	sint8
		3510	player::visibility_at (maptile *map, int x, int y) const
		3511	{
		3512	if (!ns)
		3513	return 0;
		3514
		3515	int dx, dy;
		3516	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3517	return 0;
		3518
		3519	x += dx - ns->current_x + ns->mapx / 2;
		3520	y += dy - ns->current_y + ns->mapy / 2;
		3521
		3522	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
		3523	return 0;
		3524
		3525	return 100 - blocked_los [x][y];
		3526	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.83 by root, Wed Jan 3 20:08:04 2007 UTC vs. Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.83 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC