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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.74 by root, Sat Dec 30 10:16:11 2006 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
161	set_first_map (object *op)	155	set_first_map (object *op)
162	{	156	{
163	strcpy (op->contr->maplevel, first_map_path);	157	op->contr->maplevel = first_map_path;
164	op->x = -1;	158	op->x = -1;
165	op->y = -1;	159	op->y = -1;
		160	}
		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;
166	op->enter_exit (0);	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);
167	}	211	}
168		212
169	// connect the player with a specific client	213	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	214	// also changed, rationalises, and fixes some incorrect settings
171	void	215	void
172	player::connect (client *ns)	216	player::connect (client *ns)
173	{	217	{
174	this->ns = ns;	218	this->ns = ns;
175	ns->pl = this;	219	ns->pl = this;
176		220
177	next = first_player;	221	run_on = 0;
178	first_player = this;	222	fire_on = 0;
		223	ob->close_container (); //TODO: client-specific
179		224
180	ns->update_look = 0;	225	ns->update_look = 0;
181	ns->look_position = 0;	226	ns->look_position = 0;
182		227
183	clear_los (ob);	228	clear_los (ob);
		229
		230	ns->reset_stats ();
184		231
185	/* make sure he's a player -- needed because of class change. */	232	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	233	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	234	ob->race = ob->arch->clone.race;
188		235
…		…
193	link_player_skills (ob);	240	link_player_skills (ob);
194		241
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	242	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196		243
197	assign (title, ob->arch->clone.name);	244	assign (title, ob->arch->clone.name);
198
199	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
200	* from the class, and not race. I don't see any way to get the class information
201	* to then update this. I don't think this will actually break anything - anyone
202	* that can use armour should be able to use a shield. What this may 'break'
203	* are features new characters get, eg, if someone starts up with a Q, they
204	* should be able to use a shield. However, old Q's won't get that advantage.
205	*/
206	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
207	SET_FLAG (ob, FLAG_USE_SHIELD);
208		245
209	/* if it's a dragon player, set the correct title here */	246	/* if it's a dragon player, set the correct title here */
210	if (is_dragon_pl (ob))	247	if (is_dragon_pl (ob))
211	{	248	{
212	object tmp, abil = 0, *skin = 0;	249	object tmp, abil = 0, *skin = 0;
…		…
222	skin = tmp;	259	skin = tmp;
223		260
224	set_dragon_name (ob, abil, skin);	261	set_dragon_name (ob, abil, skin);
225	}	262	}
226		263
227	CLEAR_FLAG (ob, FLAG_FRIENDLY);
228	add_friendly_object (ob);
229
230	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
231
232	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	264	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
233		265
234	esrv_new_player (this, ob->weight + ob->carrying);	266	esrv_new_player (this, ob->weight + ob->carrying);
235		267
236	ob->update_stats ();	268	ob->update_stats ();
237	ns->floorbox_update ();	269	ns->floorbox_update ();
238		270
239	esrv_send_inventory (ob, ob);	271	esrv_send_inventory (ob, ob);
240	esrv_add_spells (this, 0);	272	esrv_add_spells (this, 0);
241		273
242	ob->enter_exit (0);
243	ob->activate (1);	274	activate ();
244		275
245	send_rules (ob);	276	send_rules (ob);
246	send_news (ob);	277	send_news (ob);
247	display_motd (ob);	278	display_motd (ob);
		279
		280	INVOKE_PLAYER (CONNECT, this);
248	INVOKE_PLAYER (LOGIN, this);	281	INVOKE_PLAYER (LOGIN, this);
249	}	282	}
250		283
251	void	284	void
252	player::disconnect ()	285	player::disconnect ()
253	{	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
254	if (ob)	299	if (ob)
		300	ob->close_container (); //TODO: client-specific
		301
255	ob->deactivate (1);	302	deactivate ();
256
257	//TODO: don't be so harsh and destroy :)
258	if (ns)
259	{
260	if (enable_save)
261	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
262
263	client *ns = this->ns;
264	ns->send_packet ("goodbye");
265	ns->flush ();
266	ns->pl = 0;
267	this->ns = 0;
268
269	ns->destroy ();
270	destroy ();
271	}
272	}	303	}
273		304
274	// the need for this function can be explained	305	// the need for this function can be explained
275	// by load_object not returning the object	306	// by load_object not returning the object
276	void	307	void
277	player::set_object (object *op)	308	player::set_object (object *op)
278	{	309	{
279	ob = op;	310	ob = op;
280	ob->contr = this; /* this aren't yet in archetype */	311	ob->contr = this; /* this aren't yet in archetype */
281		312
282	ob->speed_left = 0.5;	313	ob->speed_left = 0.5;
283	ob->speed = 1.0;	314	ob->speed = 1.0;
284	ob->direction = 5; /* So player faces south */	315	ob->direction = 5; /* So player faces south */
285	ob->stats.wc = 2;
286	ob->run_away = 25; /* Then we panick... */
287
288	set_first_map (ob);
289
290	ob->roll_stats ();
291	}	316	}
292		317
293	player::player ()	318	player::player ()
294	{	319	{
295	/* There are some elements we want initialized to non zero value -	320	/* There are some elements we want initialised to non zero value -
296	* we deal with that below this point.	321	* we deal with that below this point.
297	*/	322	*/
298	outputs_sync = 16; /* Every 2 seconds */	323	outputs_sync = 4;
299	outputs_count = 8; /* Keeps present behaviour */	324	outputs_count = 4;
300	unapply = unapply_nochoice;	325	unapply = unapply_nochoice;
301		326
302	assign (savebed_map, first_map_path); /* Init. respawn position */	327	savebed_map = first_map_path; /* Init. respawn position */
303		328
304	gen_sp_armour = 10;	329	gen_sp_armour = 10;
305	last_speed = -1;
306	shoottype = range_none;	330	shoottype = range_none;
307	bowtype = bow_normal;	331	bowtype = bow_normal;
308	petmode = pet_normal;	332	petmode = pet_normal;
309	listening = 10;	333	listening = 10;
310	usekeys = containers;	334	usekeys = containers;
311	last_weapon_sp = -1;
312	peaceful = 1; /* default peaceful */	335	peaceful = 1; /* default peaceful */
313	do_los = 1;	336	do_los = 1;
314
315	/* we need to clear these to -1 and not zero - otherwise,
316	* if a player quits and starts a new character, we wont
317	* send new values to the client, as things like exp start
318	* at zero.
319	*/
320	for (int i = 0; i < NUM_SKILLS; i++)
321	last_skill_exp[i] = -1;
322
323	for (int i = 0; i < NROFATTACKS; i++)
324	last_resist[i] = -1;
325
326	last_stats.exp = -1;
327	last_weight = (uint32) - 1;
328	}	337	}
329		338
330	void	339	void
331	player::do_destroy ()	340	player::do_destroy ()
332	{	341	{
333	disconnect ();	342	disconnect ();
334		343
335	save (false);
336	enable_save = false;
337
338	attachable::do_destroy ();	344	attachable::do_destroy ();
339
340	terminate_all_pets (ob);
341
342	if (first_player != this)
343	{
344	player *prev = first_player;
345
346	while (prev && prev->next && prev->next != this)
347	prev = prev->next;
348
349	if (prev->next != this)
350	{
351	LOG (llevError, "Free_player: Can't find previous player.\n");
352	abort ();
353	}
354
355	prev->next = next;
356	}
357	else
358	first_player = next;
359		345
360	if (ob)	346	if (ob)
361	{	347	{
362	ob->destroy_inv (false);	348	ob->destroy_inv (false);
363	ob->destroy ();	349	ob->destroy ();
…		…
378	player::create ()	364	player::create ()
379	{	365	{
380	player *pl = new player;	366	player *pl = new player;
381		367
382	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
		374	set_first_map (pl->ob);
383		375
384	return pl;	376	return pl;
385	}	377	}
386		378
387	/*	379	/*
…		…
418	object *op = NULL;	410	object *op = NULL;
419	objectlink *ol;	411	objectlink *ol;
420	unsigned lastdist;	412	unsigned lastdist;
421	rv_vector rv;	413	rv_vector rv;
422		414
423	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	415	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
424	{	416	{
425	/* 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
426	* does periodically happen. Given that, lets deal with it.	418	* does periodically happen. Given that, lets deal with it.
427	* While unlikely, it is possible the next object on the friendly	419	* While unlikely, it is possible the next object on the friendly
428	* list is also free, so encapsulate this in a while loop.	420	* list is also free, so encapsulate this in a while loop.
…		…
432	object *tmp = ol->ob;	424	object *tmp = ol->ob;
433		425
434	/* 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
435	* itself will have been cleared.	427	* itself will have been cleared.
436	*/	428	*/
437	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 ());
438	ol = ol->next;	431	ol = ol->next;
439	remove_friendly_object (tmp);	432	remove_friendly_object (tmp);
440	if (!ol)	433	if (!ol)
441	return op;	434	return op;
442	}	435	}
…		…
531	x = mon->x;	524	x = mon->x;
532	y = mon->y;	525	y = mon->y;
533	m = mon->map;	526	m = mon->map;
534	dir = rv.direction;	527	dir = rv.direction;
535	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 */
536	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
537	/* 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. */
538	if (diff > max)	532	if (diff > max)
539	return 0;	533	return 0;
		534
540	while (diff > 1 && max > 0)	535	while (diff > 1 && max > 0)
541	{	536	{
542	lastx = x;	537	lastx = x;
543	lasty = y;	538	lasty = y;
544	lastmap = m;	539	lastmap = m;
…		…
626	max--;	621	max--;
627	lastdir = dir;	622	lastdir = dir;
628	if (!firstdir)	623	if (!firstdir)
629	firstdir = dir;	624	firstdir = dir;
630	}	625	}
		626
631	if (diff <= 1)	627	if (diff <= 1)
632	{	628	{
633	/* Recalculate diff (distance) because we may not have actually	629	/* Recalculate diff (distance) because we may not have actually
634	* headed toward player for entire distance.	630	* headed toward player for entire distance.
635	*/	631	*/
636	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	632	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
637	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));
638	}	634	}
		635
639	if (diff > max)	636	if (diff > max)
640	return 0;	637	return 0;
641	}	638	}
		639
642	/* 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 */
643	if (!max)	641	if (!max)
644	return 0;	642	return 0;
645		643
646	return firstdir;	644	return firstdir;
…		…
760	roll_stat (void)	758	roll_stat (void)
761	{	759	{
762	int a[4], i, j, k;	760	int a[4], i, j, k;
763		761
764	for (i = 0; i < 4; i++)	762	for (i = 0; i < 4; i++)
765	a[i] = (int) RANDOM () % 6 + 1;	763	a[i] = (int) rndm (6) + 1;
766		764
767	for (i = 0, j = 0, k = 7; i < 4; i++)	765	for (i = 0, j = 0, k = 7; i < 4; i++)
768	if (a[i] < k)	766	if (a[i] < k)
769	k = a[i], j = i;	767	k = a[i], j = i;
770		768
…		…
870	* appropriate action with it (change race, or other things).	868	* appropriate action with it (change race, or other things).
871	* The function name is for historical reasons - now we have	869	* The function name is for historical reasons - now we have
872	* separate race and class; this actually changes the RACE,	870	* separate race and class; this actually changes the RACE,
873	* not the class.	871	* not the class.
874	*/	872	*/
875	int	873	void
876	key_change_class (object *op, char key)	874	player::chargen_race_done ()
877	{	875	{
878	int tmp_loop;
879
880	if (key == 'd' \|\| key == 'D')
881	{
882	char buf[MAX_BUF];
883
884	/* this must before then initial items are given */	876	/* this must before then initial items are given */
885	esrv_new_player (op->contr, op->weight + op->carrying);	877	esrv_new_player (ob->contr, ob->weight + ob->carrying);
886		878
887	treasurelist *tl = find_treasurelist ("starting_wealth");	879	treasurelist *tl = treasurelist::find ("starting_wealth");
888	if (tl)	880	if (tl)
889	create_treasure (tl, op, 0, 0, 0);	881	create_treasure (tl, ob, 0, 0, 0);
890		882
891	INVOKE_PLAYER (BIRTH, op->contr);	883	INVOKE_PLAYER (BIRTH, ob->contr);
892	INVOKE_PLAYER (LOGIN, op->contr);	884	INVOKE_PLAYER (LOGIN, ob->contr);
893		885
894	op->contr->ns->state = ST_PLAYING;	886	ob->contr->ns->state = ST_PLAYING;
895		887
896	if (op->msg)	888	if (ob->msg)
897	op->msg = NULL;	889	ob->msg = 0;
898		890
899	/* 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
900	* to save here.	892	* to save here.
901	*/	893	*/
		894	{
		895	char buf[MAX_BUF];
902	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	896	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
903	make_path_to_file (buf);	897	make_path_to_file (buf);
		898	}
904		899
905	#ifdef AUTOSAVE
906	op->contr->last_save_tick = pticks;
907	#endif
908	start_info (op);	900	start_info (ob);
909	CLEAR_FLAG (op, FLAG_WIZ);	901	CLEAR_FLAG (ob, FLAG_WIZ);
910	give_initial_items (op, op->randomitems);	902	give_initial_items (ob, ob->randomitems);
911	link_player_skills (op);	903	link_player_skills (ob);
912	esrv_send_inventory (op, op);	904	esrv_send_inventory (ob, ob);
913	op->update_stats ();	905	ob->update_stats ();
914		906
915	/* This moves the player to a different start map, if there	907	/* This moves the player to a different start map, if there
916	* is one for this race	908	* is one for this race
917	*/	909	*/
918	if (*first_map_ext_path)	910	if (*first_map_ext_path)
919	{	911	{
920	object *tmp;	912	object *tmp;
921	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
922		914
923	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);
924	tmp = object::create ();	916	tmp = object::create ();
925	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
926	EXIT_X (tmp) = op->x;	918	EXIT_X (tmp) = ob->x;
927	EXIT_Y (tmp) = op->y;	919	EXIT_Y (tmp) = ob->y;
928	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;
929	* if the map isn't there, then stay on the	921	* if the map isn't there, then stay on the
930	* default initial map */	922	* default initial map */
931	tmp->destroy ();	923	tmp->destroy ();
932	}	924	}
933	else	925	else
934	LOG (llevDebug, "first_map_ext_path not set\n");	926	LOG (llevDebug, "first_map_ext_path not set\n");
		927	}
935		928
936	return 0;	929	void
937	}	930	player::chargen_race_next ()
938		931	{
939	/* Following actually changes the race - this is the default command	932	/* Following actually changes the race - this is the default command
940	* if we don't match with one of the options above.	933	* if we don't match with one of the options above.
941	*/	934	*/
942		935
943	tmp_loop = 0;	936	do
944	while (!tmp_loop)
945	{	937	{
946	shstr name = op->name;	938	shstr name = ob->name;
947	int x = op->x, y = op->y;	939	int x = ob->x, y = ob->y;
948		940
949	op->remove_statbonus ();	941	ob->remove_statbonus ();
950	op->remove ();	942	ob->remove ();
951	op->arch = get_player_archetype (op->arch);	943	ob->arch = get_player_archetype (ob->arch);
952	op->arch->clone.copy_to (op);	944	ob->arch->clone.copy_to (ob);
953	op->instantiate ();	945	ob->instantiate ();
954	op->stats = op->contr->orig_stats;	946	ob->stats = ob->contr->orig_stats;
955	op->name = op->name_pl = name;	947	ob->name = ob->name_pl = name;
956	op->x = x;	948	ob->x = x;
957	op->y = y;	949	ob->y = y;
958	SET_ANIMATION (op, 2); /* So player faces south */	950	SET_ANIMATION (ob, 2); /* So player faces south */
959	insert_ob_in_map (op, op->map, op, 0);	951	insert_ob_in_map (ob, ob->map, ob, 0);
960	assign (op->contr->title, op->arch->clone.name);	952	assign (ob->contr->title, ob->arch->clone.name);
961	op->add_statbonus ();	953	ob->add_statbonus ();
962	tmp_loop = allowed_class (op);
963	}	954	}
		955	while (!allowed_class (ob));
964		956
965	update_object (op, UP_OBJ_FACE);	957	update_object (ob, UP_OBJ_FACE);
966	esrv_update_item (UPD_FACE, op, op);	958	esrv_update_item (UPD_FACE, ob, ob);
967	op->update_stats ();	959	ob->update_stats ();
968	op->stats.hp = op->stats.maxhp;	960	ob->stats.hp = ob->stats.maxhp;
969	op->stats.sp = op->stats.maxsp;	961	ob->stats.sp = ob->stats.maxsp;
970	op->stats.grace = 0;	962	ob->stats.grace = 0;
971
972	if (op->msg)
973	new_draw_info (NDI_BLUE, 0, op, op->msg);
974
975	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
976	return 0;
977	}
978
979	int
980	key_confirm_quit (object *op, char key)
981	{
982	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
983	{
984	op->contr->ns->state = ST_PLAYING;
985	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
986	return 1;
987	}
988
989	INVOKE_PLAYER (LOGOUT, op->contr);
990	INVOKE_PLAYER (QUIT, op->contr);
991
992	op->contr->enable_save = false;
993
994	terminate_all_pets (op);
995	op->remove ();
996	op->direction = 0;
997	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
998
999	strcpy (op->contr->killer, "quit");
1000	check_score (op);
1001	op->contr->party = 0;
1002	op->contr->own_title[0] = '\0';
1003	op->contr->destroy ();
1004
1005	return 1;
1006	}	963	}
1007		964
1008	void	965	void
1009	flee_player (object *op)	966	flee_player (object *op)
1010	{	967	{
…		…
1067	int	1024	int
1068	check_pick (object *op)	1025	check_pick (object *op)
1069	{	1026	{
1070	object tmp, next;	1027	object tmp, next;
1071	int stop = 0;	1028	int stop = 0;
1072	int j, k, wvratio;	1029	int wvratio;
1073	char putstring[128], tmpstr[16];	1030	char putstring[128];
1074		1031
1075	/* if you're flying, you cna't pick up anything */	1032	/* if you're flying, you cna't pick up anything */
1076	if (op->move_type & MOVE_FLYING)	1033	if (op->move_type & MOVE_FLYING)
1077	return 1;	1034	return 1;
1078		1035
…		…
1415	* found object is returned.	1372	* found object is returned.
1416	*/	1373	*/
1417	object *	1374	object *
1418	find_arrow (object op, const char type)	1375	find_arrow (object op, const char type)
1419	{	1376	{
1420	object *tmp = NULL;	1377	object *tmp = 0;
1421		1378
1422	for (op = op->inv; op; op = op->below)	1379	for (op = op->inv; op; op = op->below)
1423	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))
1424	tmp = find_arrow (op, type);	1381	tmp = find_arrow (op, type);
1425	else if (op->type == ARROW && op->race == type)	1382	else if (op->type == ARROW && op->race == type)
1426	return op;	1383	return op;
		1384
1427	return tmp;	1385	return tmp;
1428	}	1386	}
1429		1387
1430	/*	1388	/*
1431	* 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
1432	* 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
1433	* 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
1434	* 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.
1435	*/	1393	*/
1436
1437	object *	1394	object *
1438	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)
1439	{	1396	{
1440	object tmp = NULL, arrow, *ntmp;	1397	object tmp = NULL, arrow, *ntmp;
1441	int attacknum, attacktype, betterby = 0, i;	1398	int attacknum, attacktype, betterby = 0, i;
…		…
1633	if (op->type == PLAYER)	1590	if (op->type == PLAYER)
1634	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);
1635	/* 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 */
1636	else	1593	else
1637	CLEAR_FLAG (op, FLAG_READY_BOW);	1594	CLEAR_FLAG (op, FLAG_READY_BOW);
		1595
1638	return 0;	1596	return 0;
1639	}	1597	}
1640	}	1598	}
1641		1599
1642	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);	1600	mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
…		…
1673	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1631	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674	op->update_stats ();	1632	op->update_stats ();
1675	}	1633	}
1676		1634
1677	SET_ANIMATION (arrow, arrow->direction);	1635	SET_ANIMATION (arrow, arrow->direction);
		1636
1678	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */	1637	arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1679	arrow->stats.hp = arrow->stats.dam;	1638	arrow->stats.hp = arrow->stats.dam;
1680	arrow->stats.grace = arrow->attacktype;	1639	arrow->stats.grace = arrow->attacktype;
		1640
1681	if (arrow->slaying != NULL)	1641	if (arrow->slaying)
1682	arrow->spellarg = strdup (arrow->slaying);	1642	arrow->spellarg = strdup (arrow->slaying);
1683		1643
1684	/* Note that this was different for monsters - they got their level	1644	arrow->stats.dam += op->stats.dam + arrow->magic;
1685	* added to the damage. I think the strength bonus is more proper.
1686	*/
1687
1688	arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1689		1645
1690	/* update the speed */	1646	/* update the speed */
1691	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1647	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1692	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;
1693		1649
1694	arrow->set_speed (max (arrow->speed, 1.0));	1650	arrow->set_speed (max (arrow->speed, 1.0));
1695	arrow->speed_left = 0;	1651	arrow->speed_left = 0;
1696		1652
		1653	arrow->stats.wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
		1654
1697	if (op->type == PLAYER)	1655	if (op->type == PLAYER)
1698	{	1656	{
1699	arrow->stats.wc = 20 - bow->magic - arrow->magic -
1700	(op->chosen_skill ? op->chosen_skill->level : op->level) -
1701	dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1702
1703	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;
1704	}	1662	}
1705	else	1663	else
1706	{	1664	{
1707	arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1708	arrow->level = op->level;	1665	arrow->level = op->level;
1709	}	1666	arrow->stats.wc -= bow->magic;
1710		1667
1711	if (arrow->attacktype == AT_PHYSICAL)	1668	if (!arrow->slaying)
		1669	arrow->slaying = bow->slaying;
		1670	}
		1671
		1672	arrow->stats.wc -= arrow->level;
		1673
1712	arrow->attacktype \|= bow->attacktype;	1674	arrow->attacktype \|= bow->attacktype;
1713
1714	if (bow->slaying)
1715	arrow->slaying = bow->slaying;
1716		1675
1717	arrow->move_type = MOVE_FLY_LOW;	1676	arrow->move_type = MOVE_FLY_LOW;
1718	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1677	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1719		1678
1720	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);
…		…
1873	case range_misc:	1832	case range_misc:
1874	fire_misc_object (op, dir);	1833	fire_misc_object (op, dir);
1875	return;	1834	return;
1876		1835
1877	case range_golem: /* Control summoned monsters from scrolls */	1836	case range_golem: /* Control summoned monsters from scrolls */
1878	if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1879	{
1880	op->contr->ranges[range_golem] = 0;
1881	op->contr->shoottype = range_none;
1882	}
1883	else
1884	control_golem (op->contr->ranges[range_golem], dir);	1837	control_golem (op->contr->ranges[range_golem], dir);
1885	return;	1838	return;
1886		1839
1887	case range_skill:	1840	case range_skill:
1888	if (!op->chosen_skill)	1841	if (!op->chosen_skill)
1889	{	1842	{
1890	if (op->type == PLAYER)	1843	if (op->type == PLAYER)
1891	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
1892	return;	1846	return;
1893	}	1847	}
		1848
1894	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1849	do_skill (op, op, op->chosen_skill, dir, NULL);
1895	return;	1850	return;
1896	case range_builder:	1851	case range_builder:
1897	apply_map_builder (op, dir);	1852	apply_map_builder (op, dir);
1898	return;	1853	return;
1899	default:	1854	default:
1900	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");	1855	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1901	return;	1856	return;
1902	}	1857	}
1903	}	1858	}
1904
1905
1906		1859
1907	/* find_key	1860	/* find_key
1908	* 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
1909	* and successfully use it, we return the key, otherwise NULL	1862	* and successfully use it, we return the key, otherwise NULL
1910	* This function merges both normal and locked door, since the logic	1863	* This function merges both normal and locked door, since the logic
…		…
1912	* pl is the player,	1865	* pl is the player,
1913	* inv is the objects inventory to searched	1866	* inv is the objects inventory to searched
1914	* door is the door we are trying to match against.	1867	* door is the door we are trying to match against.
1915	* This function can be called recursively to search containers.	1868	* This function can be called recursively to search containers.
1916	*/	1869	*/
1917
1918	object *	1870	object *
1919	find_key (object pl, object container, object *door)	1871	find_key (object pl, object container, object *door)
1920	{	1872	{
1921	object tmp, key;	1873	object tmp, key;
1922		1874
1923	/* Should not happen, but sanity checking is never bad */	1875	/* Should not happen, but sanity checking is never bad */
1924	if (container->inv == NULL)	1876	if (!container->inv)
1925	return NULL;	1877	return 0;
1926		1878
1927	/* 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 */
1928	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1880	for (tmp = container->inv; tmp; tmp = tmp->below)
1929	{	1881	{
1930	if (door->type == DOOR && tmp->type == KEY)	1882	if (door->type == DOOR && tmp->type == KEY)
1931	break;	1883	break;
1932	/* For sanity, we should really check door type, but other stuff	1884	/* For sanity, we should really check door type, but other stuff
1933	* (like containers) can be locked with special keys	1885	* (like containers) can be locked with special keys
1934	*/	1886	*/
1935	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1887	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1936	break;	1888	break;
1937	}	1889	}
		1890
1938	/* No key found - lets search inventories now */	1891	/* No key found - lets search inventories now */
1939	/* 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.
1940	* 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
1941	* a key, return	1894	* a key, return
1942	*/	1895	*/
1943	if (!tmp)	1896	if (!tmp)
1944	{	1897	{
1945	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1898	for (tmp = container->inv; tmp; tmp = tmp->below)
1946	{	1899	{
1947	/* No reason to search empty containers */	1900	/* No reason to search empty containers */
1948	if (tmp->type == CONTAINER && tmp->inv)	1901	if (tmp->type == CONTAINER && tmp->inv)
1949	{	1902	{
1950	if ((key = find_key (pl, tmp, door)) != NULL)	1903	if ((key = find_key (pl, tmp, door)))
1951	return key;	1904	return key;
1952	}	1905	}
1953	}	1906	}
		1907
1954	if (!tmp)	1908	if (!tmp)
1955	return NULL;	1909	return NULL;
1956	}	1910	}
		1911
1957	/* 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,
1958	* see if we actually want to use it	1913	* see if we actually want to use it
1959	*/	1914	*/
1960	if (pl != container)	1915	if (pl != container)
1961	{	1916	{
…		…
1982	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1937	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1983	"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));
1984	return NULL;	1939	return NULL;
1985	}	1940	}
1986	}	1941	}
		1942
1987	return tmp;	1943	return tmp;
1988	}	1944	}
1989		1945
1990	/* moved door processing out of move_player_attack.	1946	/* moved door processing out of move_player_attack.
1991	* returns 1 if player has opened the door with a key	1947	* returns 1 if player has opened the door with a key
…		…
2009	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);
2010	if (action_makes_visible (op))	1966	if (action_makes_visible (op))
2011	make_visible (op);	1967	make_visible (op);
2012	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1968	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
2013	spring_trap (door->inv, op);	1969	spring_trap (door->inv, op);
		1970
2014	if (door->type == DOOR)	1971	if (door->type == DOOR)
2015	{
2016	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 */
2017	}
2018	else if (door->type == LOCKED_DOOR)	1973	else if (door->type == LOCKED_DOOR)
2019	{	1974	{
2020	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));
2021	remove_door2 (door); /* remove door without violence ;-) */	1976	remove_door2 (door); /* remove door without violence ;-) */
2022	}	1977	}
		1978
2023	/* Do this after we print the message */	1979	/* Do this after we print the message */
2024	decrease_ob (key); /* Use up one of the keys */	1980	decrease_ob (key); /* Use up one of the keys */
2025	/* Need to update the weight the container the key was in */	1981	/* Need to update the weight the container the key was in */
2026	if (container != op)	1982	if (container != op)
2027	esrv_update_item (UPD_WEIGHT, op, container);	1983	esrv_update_item (UPD_WEIGHT, op, container);
		1984
2028	return 1; /* Nothing more to do below */	1985	return 1; /* Nothing more to do below */
2029	}	1986	}
2030	else if (door->type == LOCKED_DOOR)	1987	else if (door->type == LOCKED_DOOR)
2031	{	1988	{
2032	/* Might as well return now - no other way to open this */	1989	/* Might as well return now - no other way to open this */
2033	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	1990	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2034	return 1;	1991	return 1;
2035	}	1992	}
		1993
2036	return 0;	1994	return 0;
2037	}	1995	}
2038		1996
2039	/* This function is just part of a breakup from move_player.	1997	/* This function is just part of a breakup from move_player.
2040	* It should keep the code cleaner.	1998	* It should keep the code cleaner.
…		…
2066	*/	2024	*/
2067	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))
2068	{	2026	{
2069	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2027	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2070	{	2028	{
2071	m = get_map_from_coord (op->map, &nx, &ny);	2029	m = op->map->xy_find (nx, ny);
2072	if (!m)	2030	if (!m)
2073	return; /* Don't think this should happen */	2031	return; /* Don't think this should happen */
2074	}	2032	}
2075	else	2033	else
2076	m = op->map;	2034	m = op->map;
2077		2035
2078	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2036	if (!(tmp = m->at (nx, ny).bot))
2079	{
2080	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2081	return;	2037	return;
2082	}
2083		2038
2084	mon = 0;	2039	mon = 0;
2085	/* 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
2086	* 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.
2087	* 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
…		…
2140	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2095	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2141	{	2096	{
2142	/* 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 */
2143	if (op->contr->braced)	2098	if (op->contr->braced)
2144	return;	2099	return;
		2100
2145	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);
2146	(void) push_ob (mon, dir, op);	2102	(void) push_ob (mon, dir, op);
2147	if (op->contr->tmp_invis \|\| op->hide)	2103	if (op->contr->tmp_invis \|\| op->hide)
2148	make_visible (op);	2104	make_visible (op);
		2105
2149	return;	2106	return;
2150	}	2107	}
2151		2108
2152	/* in certain circumstances, you shouldn't attack friendly	2109	/* in certain circumstances, you shouldn't attack friendly
2153	* creatures. Note that if you are braced, you can't push	2110	* creatures. Note that if you are braced, you can't push
…		…
2167	!on_battleground))	2124	!on_battleground))
2168	{	2125	{
2169	if (!op->contr->braced)	2126	if (!op->contr->braced)
2170	{	2127	{
2171	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);
2172	(void) push_ob (mon, dir, op);	2129	push_ob (mon, dir, op);
2173	}	2130	}
2174	else	2131	else
2175	new_draw_info (0, 0, op, "You withhold your attack");	2132	new_draw_info (0, 0, op, "You withhold your attack");
2176		2133
2177	if (op->contr->tmp_invis \|\| op->hide)	2134	if (op->contr->tmp_invis \|\| op->hide)
…		…
2192	* 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
2193	* and be living. Then, it must be one of the following:	2150	* and be living. Then, it must be one of the following:
2194	* 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
2195	* 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.
2196	*/	2153	*/
2197
2198	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2154	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2199	((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)))
2200	{	2156	{
2201		2157
2202	/* If the player hasn't hit something this tick, and does	2158	/* If the player hasn't hit something this tick, and does
…		…
2236	int	2192	int
2237	move_player (object *op, int dir)	2193	move_player (object *op, int dir)
2238	{	2194	{
2239	int pick;	2195	int pick;
2240		2196
2241	if (op->map == NULL \|\| op->map->in_memory != MAP_IN_MEMORY)	2197	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
2242	return 0;	2198	return 0;
2243		2199
2244	/* Sanity check: make sure dir is valid */	2200	/* Sanity check: make sure dir is valid */
2245	if ((dir < 0) \|\| (dir >= 9))	2201	if ((dir < 0) \|\| (dir >= 9))
2246	{	2202	{
2247	LOG (llevError, "move_player: invalid direction %d\n", dir);	2203	LOG (llevError, "move_player: invalid direction %d\n", dir);
2248	return 0;	2204	return 0;
2249	}	2205	}
2250		2206
2251	/* peterm: added following line */	2207	/* peterm: added following line */
2252	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2208	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2253	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2209	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2254		2210
2255	op->facing = dir;	2211	op->facing = dir;
2256		2212
2257	if (op->hide)	2213	if (op->hide)
2258	do_hidden_move (op);	2214	do_hidden_move (op);
…		…
2291	* Returns true if there are more actions we can do.	2247	* Returns true if there are more actions we can do.
2292	*/	2248	*/
2293	int	2249	int
2294	handle_newcs_player (object *op)	2250	handle_newcs_player (object *op)
2295	{	2251	{
2296	if (op->contr->hidden)
2297	{
2298	op->invisible = 1000;
2299	/* the socket code flashes the player visible/invisible
2300	* depending on the value of invisible, so we need to
2301	* alternate it here for it to work correctly.
2302	*/
2303	if (pticks & 2)
2304	op->invisible--;
2305	}
2306	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2307	{
2308	op->invisible--;
2309	if (!op->invisible)
2310	{
2311	make_visible (op);
2312	new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2313	}
2314	}
2315
2316	if (QUERY_FLAG (op, FLAG_SCARED))	2252	if (QUERY_FLAG (op, FLAG_SCARED))
2317	{	2253	{
2318	flee_player (op);	2254	flee_player (op);
2319	/* 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 */
2320	if (QUERY_FLAG (op, FLAG_SCARED))	2256	if (QUERY_FLAG (op, FLAG_SCARED))
2321	{	2257	{
2322	op->speed_left--;	2258	op->speed_left--;
2323	return 0;	2259	return 0;
2324	}	2260	}
2325	}	2261	}
2326
2327	/* I've been seeing crashes where the golem has been destroyed, but
2328	* the player object still points to the defunct golem. The code that
2329	* destroys the golem looks correct, and it doesn't always happen, so
2330	* put this in a a workaround to clean up the golem pointer.
2331	*/
2332	if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2333	op->contr->ranges[range_golem] = 0;
2334		2262
2335	/* 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
2336	* the players time has been increased when doericserver has been	2264	* the players time has been increased when doericserver has been
2337	* called, so we recheck it here.	2265	* called, so we recheck it here.
2338	*/	2266	*/
2339	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2267	if (op->contr->ns->handle_command ())
2340	for (int rep = 8; --rep && op->contr->ns->handle_command (); )	2268	return 1;
2341	;
2342		2269
2343	if (op->speed_left < 0)	2270	if (op->speed_left > 0)
2344	return 0;	2271	{
2345
2346	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2272	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2347	{	2273	{
2348	/* All move commands take 1 tick, at least for now */	2274	/* All move commands take 1 tick, at least for now */
2349	op->speed_left--;	2275	op->speed_left--;
2350		2276
2351	/* Instead of all the stuff below, let move_player take care	2277	/* Instead of all the stuff below, let move_player take care
2352	* of it. Also, some of the skill stuff is only put in	2278	* of it. Also, some of the skill stuff is only put in
2353	* there, as well as the confusion stuff.	2279	* there, as well as the confusion stuff.
2354	*/	2280	*/
2355	move_player (op, op->direction);	2281	move_player (op, op->direction);
2356	if (op->speed_left > 0)	2282
2357	return 1;	2283	return op->speed_left > 0;
2358	else	2284	}
2359	return 0;
2360	}	2285	}
2361		2286
2362	return 0;	2287	return 0;
2363	}	2288	}
2364		2289
…		…
2402	* from.	2327	* from.
2403	*/	2328	*/
2404	void	2329	void
2405	remove_unpaid_objects (object op, object env)	2330	remove_unpaid_objects (object op, object env)
2406	{	2331	{
2407	object *next;
2408
2409	while (op)	2332	while (op)
2410	{	2333	{
2411	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' */
2412		2335
2413	if (QUERY_FLAG (op, FLAG_UNPAID))	2336	if (QUERY_FLAG (op, FLAG_UNPAID))
…		…
2479	int rate_grace = 2000;	2402	int rate_grace = 2000;
2480	const int max_hp = 1;	2403	const int max_hp = 1;
2481	const int max_sp = 1;	2404	const int max_sp = 1;
2482	const int max_grace = 1;	2405	const int max_grace = 1;
2483		2406
2484	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--;
2485	{	2416	}
2486	for (i = 0; i < NUM_OUTPUT_BUFS; i++)	2417	else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2487	if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)	2418	{
2488	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	}
2489	}	2424	}
2490		2425
2491	if (op->contr->ns->state == ST_PLAYING)	2426	if (op->contr->ns->state == ST_PLAYING)
2492	{	2427	{
2493	/* these next three if clauses make it possible to SLOW DOWN	2428	/* these next three if clauses make it possible to SLOW DOWN
…		…
2515	gen_grace = op->stats.maxgrace;	2450	gen_grace = op->stats.maxgrace;
2516	rate_grace -= rate_grace / 2 * op->contr->gen_grace;	2451	rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2517	}	2452	}
2518		2453
2519	/* Regenerate Spell Points */	2454	/* Regenerate Spell Points */
2520	if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)	2455	if (!op->contr->ranges[range_golem] && --op->last_sp < 0)
2521	{	2456	{
2522	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);
2523	if (op->stats.sp < op->stats.maxsp)	2458	if (op->stats.sp < op->stats.maxsp)
2524	{	2459	{
2525	op->stats.sp++;	2460	op->stats.sp++;
…		…
2743	tmp->name = buf;	2678	tmp->name = buf;
2744	sprintf (buf, " This finger has been cut off %s\n"	2679	sprintf (buf, " This finger has been cut off %s\n"
2745	" 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",
2746	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2681	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2747	tmp->msg = buf;	2682	tmp->msg = buf;
2748	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2683	tmp->value = 0, tmp->type = 0;
2749	tmp->materialname = NULL;	2684	tmp->materialname = "organics";
2750	op->insert_at (tmp, op);	2685	tmp->insert_at (op, tmp);
2751	}	2686	}
2752		2687
2753	/* teleport defeated player to new destination */	2688	/* teleport defeated player to new destination */
2754	transfer_ob (op, x, y, 0, NULL);	2689	transfer_ob (op, x, y, 0, NULL);
2755	op->contr->braced = 0;	2690	op->contr->braced = 0;
…		…
2760		2695
2761	command_kill_pets (op, 0);	2696	command_kill_pets (op, 0);
2762		2697
2763	if (op->stats.food < 0)	2698	if (op->stats.food < 0)
2764	{	2699	{
2765	if (op->contr->explore)
2766	{
2767	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2768	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2769	op->stats.food = 999;
2770	return;
2771	}
2772	sprintf (buf, "%s starved to death.", &op->name);	2700	sprintf (buf, "%s starved to death.", &op->name);
2773	strcpy (op->contr->killer, "starvation");	2701	strcpy (op->contr->killer, "starvation");
2774	}	2702	}
2775	else	2703	else
2776	{
2777	if (op->contr->explore)
2778	{
2779	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2780	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2781	op->stats.hp = op->stats.maxhp;
2782	return;
2783	}
2784	sprintf (buf, "%s died.", &op->name);	2704	sprintf (buf, "%s died.", &op->name);
2785	}
2786		2705
2787	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2706	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2788		2707
2789	/* save the map location for corpse, gravestone */	2708	/* save the map location for corpse, gravestone */
2790	x = op->x;	2709	x = op->x;
…		…
2966	op->stats.hp = op->stats.maxhp;	2885	op->stats.hp = op->stats.maxhp;
2967	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);	2886	op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2968	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);	2887	op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2969		2888
2970	/*	2889	/*
2971	* Check to see if the player is in a shop. IF so, then check to see if
2972	* 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
2973	* in the map.	2891	* and put them back in the map.
2974	*/	2892	*/
2975
2976	if (is_in_shop (op))
2977	remove_unpaid_objects (op->inv, op);	2893	remove_unpaid_objects (op->inv, op);
2978		2894
2979	/****************************************/	2895	/****************************************/
2980	/* */	2896	/* */
2981	/* Move player to his current respawn- */	2897	/* Move player to his current respawn- */
2982	/* position (usually last savebed) */	2898	/* position (usually last savebed) */
2983	/* */	2899	/* */
2984	/****************************************/	2900	/****************************************/
2985		2901
2986	enter_player_savebed (op);	2902	enter_player_savebed (op);
2987		2903
2988	/* Save the player before inserting the force to reduce
2989	* chance of abuse.
2990	*/
2991	op->contr->braced = 0;	2904	op->contr->braced = 0;
2992	op->contr->save ();
2993		2905
2994	/* it is possible that the player has blown something up	2906	/* it is possible that the player has blown something up
2995	* at his savebed location, and that can have long lasting	2907	* at his savebed location, and that can have long lasting
2996	* spell effects. So first see if there is a spell effect	2908	* spell effects. So first see if there is a spell effect
2997	* on the space that might harm the player.	2909	* on the space that might harm the player.
…		…
3026	void	2938	void
3027	loot_object (object *op)	2939	loot_object (object *op)
3028	{ /* Grab and destroy some treasure */	2940	{ /* Grab and destroy some treasure */
3029	object tmp, tmp2, *next;	2941	object tmp, tmp2, *next;
3030		2942
3031	if (op->container)	2943	op->close_container (); /* close open sack first */
3032	esrv_apply_container (op, op->container); /* close open sack first */
3033		2944
3034	for (tmp = op->inv; tmp; tmp = next)	2945	for (tmp = op->inv; tmp; tmp = next)
3035	{	2946	{
3036	next = tmp->below;	2947	next = tmp->below;
3037		2948
3038	if (tmp->invisible)	2949	if (tmp->invisible)
3039	continue;	2950	continue;
3040		2951
3041	tmp->remove ();	2952	tmp->remove ();
3042	tmp->x = op->x, tmp->y = op->y;	2953	tmp->x = op->x, tmp->y = op->y;
		2954
3043	if (tmp->type == CONTAINER)	2955	if (tmp->type == CONTAINER)
3044	{ /* empty container to ground */	2956	loot_object (tmp); /* empty container to ground */
3045	loot_object (tmp);	2957
3046	}
3047	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))))
3048	{	2959	{
3049	if (tmp->nrof > 1)	2960	if (tmp->nrof > 1)
3050	{	2961	{
3051	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2962	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3052	tmp2->destroy ();	2963	tmp2->destroy ();
…		…
3063	/*	2974	/*
3064	* fix_weight(): Check recursively the weight of all players, and fix	2975	* fix_weight(): Check recursively the weight of all players, and fix
3065	* 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
3066	* was changed.	2977	* was changed.
3067	*/	2978	*/
3068
3069	void	2979	void
3070	fix_weight (void)	2980	fix_weight (void)
3071	{	2981	{
3072	for_all_players (pl)	2982	for_all_players (pl)
3073	{	2983	{
…		…
3133	if (op->type == PLAYER)	3043	if (op->type == PLAYER)
3134	{	3044	{
3135	op->contr->tmp_invis = 0;	3045	op->contr->tmp_invis = 0;
3136	op->contr->invis_race = 0;	3046	op->contr->invis_race = 0;
3137	}	3047	}
		3048
3138	update_object (op, UP_OBJ_FACE);	3049	update_object (op, UP_OBJ_CHANGE);
3139	}	3050	}
3140		3051
3141	int	3052	int
3142	is_true_undead (object *op)	3053	is_true_undead (object *op)
3143	{	3054	{
3144	object *tmp = NULL;
3145
3146	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3055	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3147	return 1;	3056	return 1;
3148		3057
3149	return 0;	3058	return 0;
3150	}	3059	}
…		…
3209		3118
3210	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3119	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3211		3120
3212	/* 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! */
3213	if (op->type == PLAYER && op->contr->run_on)	3122	if (op->type == PLAYER && op->contr->run_on)
3214	{
3215	if (!skop \|\| num >= skop->level)	3123	if (!skop \|\| num >= skop->level)
3216	{	3124	{
3217	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!");
3218	make_visible (op);	3126	make_visible (op);
3219	return;	3127	return;
3220	}	3128	}
3221	else	3129	else
3222	num += 20;	3130	num += 20;
3223	}	3131
3224	num += op->map->difficulty;	3132	num += op->map->difficulty;
3225	hide = hideability (op); /* modify by terrain hidden level */	3133	hide = hideability (op); /* modify by terrain hidden level */
3226	num -= hide;	3134	num -= hide;
		3135
3227	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))	3136	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))
3228	{	3137	{
3229	make_visible (op);	3138	make_visible (op);
3230	if (op->type == PLAYER)	3139	if (op->type == PLAYER)
3231	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!");
3232	}	3141	}
3233	else if (op->type == PLAYER && skop)	3142	else if (op->type == PLAYER && skop)
3234	{
3235	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);
3236	}
3237	}	3144	}
3238		3145
3239	/* determine if who is standing near a hostile creature. */	3146	/* determine if who is standing near a hostile creature. */
3240		3147
3241	int	3148	int
…		…
3440	char buf[MAX_BUF]; /* tmp. string buffer */	3347	char buf[MAX_BUF]; /* tmp. string buffer */
3441	int i = 0, j = 0;	3348	int i = 0, j = 0;
3442		3349
3443	/* get the appropriate treasurelist */	3350	/* get the appropriate treasurelist */
3444	if (atnr == ATNR_FIRE)	3351	if (atnr == ATNR_FIRE)
3445	trlist = find_treasurelist ("dragon_ability_fire");	3352	trlist = treasurelist::find ("dragon_ability_fire");
3446	else if (atnr == ATNR_COLD)	3353	else if (atnr == ATNR_COLD)
3447	trlist = find_treasurelist ("dragon_ability_cold");	3354	trlist = treasurelist::find ("dragon_ability_cold");
3448	else if (atnr == ATNR_ELECTRICITY)	3355	else if (atnr == ATNR_ELECTRICITY)
3449	trlist = find_treasurelist ("dragon_ability_elec");	3356	trlist = treasurelist::find ("dragon_ability_elec");
3450	else if (atnr == ATNR_POISON)	3357	else if (atnr == ATNR_POISON)
3451	trlist = find_treasurelist ("dragon_ability_poison");	3358	trlist = treasurelist::find ("dragon_ability_poison");
3452		3359
3453	if (trlist == NULL \|\| who->type != PLAYER)	3360	if (trlist == NULL \|\| who->type != PLAYER)
3454	return;	3361	return;
3455		3362
3456	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++);
3457		3364
3458	if (tr == NULL \|\| tr->item == NULL)	3365	if (!tr \|\| !tr->item)
3459	{	3366	{
3460	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3367	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3461	return;	3368	return;
3462	}	3369	}
3463		3370
…		…
3588	* not readied.	3495	* not readied.
3589	*/	3496	*/
3590	void	3497	void
3591	player_unready_range_ob (player pl, object ob)	3498	player_unready_range_ob (player pl, object ob)
3592	{	3499	{
3593	rangetype i;
3594
3595	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))
3596	{
3597	if (pl->ranges[i] == ob)	3501	if (pl->ranges[i] == ob)
3598	{	3502	{
3599	pl->ranges[i] = NULL;	3503	pl->ranges[i] = 0;
3600	if (pl->shoottype == i)	3504	if (pl->shoottype == i)
3601	{
3602	pl->shoottype = range_none;	3505	pl->shoottype = range_none;
3603	}
3604	}	3506	}
3605	}
3606	}	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.74 by root, Sat Dec 30 10:16:11 2006 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.74 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.116 by root, Sun Apr 29 03:44:36 2007 UTC