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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.68 by root, Tue Dec 26 09:52:40 2006 UTC vs.
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 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", "%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	}
…		…
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	enter_exit (op, 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	maplevel = ob->map->path;
		200	ob->remove ();
		201	ob->map = 0;
		202	party = 0;
		203
		204	// for weird reasons, this is often "ob", keeping a circular reference
		205	ranges [range_skill] = 0;
		206
		207	players.erase (this);
167	}	208	}
168		209
169	// connect the player with a specific client	210	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	211	// also changed, rationalises, and fixes some incorrect settings
171	void	212	void
172	player::connect (client *ns)	213	player::connect (client *ns)
173	{	214	{
174	this->ns = ns;	215	this->ns = ns;
175	ns->pl = this;	216	ns->pl = this;
176		217
177	next = first_player;	218	run_on = 0;
178	first_player = this;	219	fire_on = 0;
		220	ob->close_container (); //TODO: client-specific
179		221
180	ns->update_look = 0;	222	ns->update_look = 0;
181	ns->look_position = 0;	223	ns->look_position = 0;
182		224
183	clear_los (ob);	225	clear_los (ob);
		226
		227	ns->reset_stats ();
184		228
185	/* make sure he's a player -- needed because of class change. */	229	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	230	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	231	ob->race = ob->arch->clone.race;
188		232
…		…
191		235
192	ob->carrying = sum_weight (ob);	236	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	237	link_player_skills (ob);
194		238
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	239	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	ob->set_speed (ob->speed);
197		240
198	assign (title, ob->arch->clone.name);	241	assign (title, ob->arch->clone.name);
199
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come
201	* from the class, and not race. I don't see any way to get the class information
202	* to then update this. I don't think this will actually break anything - anyone
203	* that can use armour should be able to use a shield. What this may 'break'
204	* are features new characters get, eg, if someone starts up with a Q, they
205	* should be able to use a shield. However, old Q's won't get that advantage.
206	*/
207	if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
208	SET_FLAG (ob, FLAG_USE_SHIELD);
209		242
210	/* if it's a dragon player, set the correct title here */	243	/* if it's a dragon player, set the correct title here */
211	if (is_dragon_pl (ob))	244	if (is_dragon_pl (ob))
212	{	245	{
213	object tmp, abil = 0, *skin = 0;	246	object tmp, abil = 0, *skin = 0;
…		…
223	skin = tmp;	256	skin = tmp;
224		257
225	set_dragon_name (ob, abil, skin);	258	set_dragon_name (ob, abil, skin);
226	}	259	}
227		260
228	CLEAR_FLAG (ob, FLAG_FRIENDLY);
229	add_friendly_object (ob);
230
231	LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");	261	new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234	new_draw_info_format (NDI_UNIQUE \| NDI_ALL \| NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235		262
236	esrv_new_player (this, ob->weight + ob->carrying);	263	esrv_new_player (this, ob->weight + ob->carrying);
237		264
238	ob->update_stats ();	265	ob->update_stats ();
239	ns->floorbox_update ();	266	ns->floorbox_update ();
240		267
241	esrv_send_inventory (ob, ob);	268	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	269	esrv_add_spells (this, 0);
243		270
244	enter_exit (ob, 0);	271	activate ();
245		272
246	send_rules (ob);	273	send_rules (ob);
247	send_news (ob);	274	send_news (ob);
248	display_motd (ob);	275	display_motd (ob);
		276
		277	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	278	INVOKE_PLAYER (LOGIN, this);
250	}	279	}
251		280
252	void	281	void
253	player::disconnect ()	282	player::disconnect ()
254	{	283	{
255	//TODO: don't be so harsh and destroy :)
256	if (ns)	284	if (ns)
257	destroy ();	285	{
		286	if (active)
		287	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		288
		289	INVOKE_PLAYER (DISCONNECT, this);
		290
		291	ns->reset_stats ();
		292	ns->pl = 0;
		293	this->ns = 0;
		294	}
		295
		296	if (ob)
		297	ob->close_container (); //TODO: client-specific
		298
		299	deactivate ();
258	}	300	}
259		301
260	// the need for this function can be explained	302	// the need for this function can be explained
261	// by load_object not returning the object	303	// by load_object not returning the object
262	void	304	void
263	player::set_object (object *op)	305	player::set_object (object *op)
264	{	306	{
265	ob = op;	307	ob = op;
266	ob->contr = this; /* this aren't yet in archetype */	308	ob->contr = this; /* this aren't yet in archetype */
267		309
268	ob->speed_left = 0.5;	310	ob->speed_left = 0.5;
269	ob->speed = 1.0;	311	ob->speed = 1.0;
270	ob->direction = 5; /* So player faces south */	312	ob->direction = 5; /* So player faces south */
271	ob->stats.wc = 2;
272	ob->run_away = 25; /* Then we panick... */
273
274	set_first_map (ob);
275
276	ob->roll_stats ();
277	}	313	}
278		314
279	player::player ()	315	player::player ()
280	{	316	{
281	/* There are some elements we want initialized to non zero value -	317	/* There are some elements we want initialised to non zero value -
282	* we deal with that below this point.	318	* we deal with that below this point.
283	*/	319	*/
284	outputs_sync = 16; /* Every 2 seconds */	320	outputs_sync = 16; /* Every 2 seconds */
285	outputs_count = 8; /* Keeps present behaviour */	321	outputs_count = 8; /* Keeps present behaviour */
286	unapply = unapply_nochoice;	322	unapply = unapply_nochoice;
287		323
288	assign (savebed_map, first_map_path); /* Init. respawn position */	324	savebed_map = first_map_path; /* Init. respawn position */
289		325
290	gen_sp_armour = 10;	326	gen_sp_armour = 10;
291	last_speed = -1;
292	shoottype = range_none;	327	shoottype = range_none;
293	bowtype = bow_normal;	328	bowtype = bow_normal;
294	petmode = pet_normal;	329	petmode = pet_normal;
295	listening = 10;	330	listening = 10;
296	usekeys = containers;	331	usekeys = containers;
297	last_weapon_sp = -1;
298	peaceful = 1; /* default peaceful */	332	peaceful = 1; /* default peaceful */
299	do_los = 1;	333	do_los = 1;
300
301	/* we need to clear these to -1 and not zero - otherwise,
302	* if a player quits and starts a new character, we wont
303	* send new values to the client, as things like exp start
304	* at zero.
305	*/
306	for (int i = 0; i < NUM_SKILLS; i++)
307	last_skill_exp[i] = -1;
308
309	for (int i = 0; i < NROFATTACKS; i++)
310	last_resist[i] = -1;
311
312	last_stats.exp = -1;
313	last_weight = (uint32) - 1;
314	}	334	}
315		335
316	void	336	void
317	player::do_destroy ()	337	player::do_destroy ()
318	{	338	{
		339	disconnect ();
		340
319	attachable::do_destroy ();	341	attachable::do_destroy ();
320		342
321	save (false);
322	enable_save = false;
323
324	disconnect ();
325
326	terminate_all_pets (ob);
327
328	if (first_player != this)
329	{
330	player *prev = first_player;
331
332	while (prev && prev->next && prev->next != this)
333	prev = prev->next;
334
335	if (prev->next != this)
336	{
337	LOG (llevError, "Free_player: Can't find previous player.\n");
338	abort ();
339	}
340
341	prev->next = next;
342	}
343	else
344	first_player = next;
345
346	if (ob)	343	if (ob)
		344	{
		345	ob->destroy_inv (false);
347	ob->destroy ();	346	ob->destroy ();
348
349	if (ns)
350	{
351	client *ns = this->ns;
352	ns->send_packet ("goodbye");
353	ns->flush ();
354	ns->pl = 0;
355	this->ns = 0;
356	ns->destroy ();
357	}	347	}
358	}	348	}
359		349
360	player::~player ()	350	player::~player ()
361	{	351	{
…		…
371	player::create ()	361	player::create ()
372	{	362	{
373	player *pl = new player;	363	player *pl = new player;
374		364
375	pl->set_object (arch_to_object (get_player_archetype (0)));	365	pl->set_object (arch_to_object (get_player_archetype (0)));
		366
		367	pl->ob->roll_stats ();
		368	pl->ob->stats.wc = 2;
		369	pl->ob->run_away = 25; /* Then we panick... */
		370
		371	set_first_map (pl->ob);
376		372
377	return pl;	373	return pl;
378	}	374	}
379		375
380	/*	376	/*
…		…
411	object *op = NULL;	407	object *op = NULL;
412	objectlink *ol;	408	objectlink *ol;
413	unsigned lastdist;	409	unsigned lastdist;
414	rv_vector rv;	410	rv_vector rv;
415		411
416	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	412	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
417	{	413	{
418	/* We should not find free objects on this friendly list, but it	414	/* We should not find free objects on this friendly list, but it
419	* does periodically happen. Given that, lets deal with it.	415	* does periodically happen. Given that, lets deal with it.
420	* While unlikely, it is possible the next object on the friendly	416	* While unlikely, it is possible the next object on the friendly
421	* list is also free, so encapsulate this in a while loop.	417	* list is also free, so encapsulate this in a while loop.
…		…
425	object *tmp = ol->ob;	421	object *tmp = ol->ob;
426		422
427	/* Can't do much more other than log the fact, because the object	423	/* Can't do much more other than log the fact, because the object
428	* itself will have been cleared.	424	* itself will have been cleared.
429	*/	425	*/
430	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	426	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		427	tmp->debug_desc ());
431	ol = ol->next;	428	ol = ol->next;
432	remove_friendly_object (tmp);	429	remove_friendly_object (tmp);
433	if (!ol)	430	if (!ol)
434	return op;	431	return op;
435	}	432	}
…		…
524	x = mon->x;	521	x = mon->x;
525	y = mon->y;	522	y = mon->y;
526	m = mon->map;	523	m = mon->map;
527	dir = rv.direction;	524	dir = rv.direction;
528	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */	525	lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
529	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	526	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
		527
530	/* If we can't solve it within the search distance, return now. */	528	/* If we can't solve it within the search distance, return now. */
531	if (diff > max)	529	if (diff > max)
532	return 0;	530	return 0;
		531
533	while (diff > 1 && max > 0)	532	while (diff > 1 && max > 0)
534	{	533	{
535	lastx = x;	534	lastx = x;
536	lasty = y;	535	lasty = y;
537	lastmap = m;	536	lastmap = m;
…		…
619	max--;	618	max--;
620	lastdir = dir;	619	lastdir = dir;
621	if (!firstdir)	620	if (!firstdir)
622	firstdir = dir;	621	firstdir = dir;
623	}	622	}
		623
624	if (diff <= 1)	624	if (diff <= 1)
625	{	625	{
626	/* Recalculate diff (distance) because we may not have actually	626	/* Recalculate diff (distance) because we may not have actually
627	* headed toward player for entire distance.	627	* headed toward player for entire distance.
628	*/	628	*/
629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);	629	get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
630	diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);	630	diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
631	}	631	}
		632
632	if (diff > max)	633	if (diff > max)
633	return 0;	634	return 0;
634	}	635	}
		636
635	/* If we reached the max, didn't find a direction in time */	637	/* If we reached the max, didn't find a direction in time */
636	if (!max)	638	if (!max)
637	return 0;	639	return 0;
638		640
639	return firstdir;	641	return firstdir;
…		…
753	roll_stat (void)	755	roll_stat (void)
754	{	756	{
755	int a[4], i, j, k;	757	int a[4], i, j, k;
756		758
757	for (i = 0; i < 4; i++)	759	for (i = 0; i < 4; i++)
758	a[i] = (int) RANDOM () % 6 + 1;	760	a[i] = (int) rndm (6) + 1;
759		761
760	for (i = 0, j = 0, k = 7; i < 4; i++)	762	for (i = 0, j = 0, k = 7; i < 4; i++)
761	if (a[i] < k)	763	if (a[i] < k)
762	k = a[i], j = i;	764	k = a[i], j = i;
763		765
…		…
844	contr->levsp[1] = 6;	846	contr->levsp[1] = 6;
845	contr->levgrace[1] = 3;	847	contr->levgrace[1] = 3;
846		848
847	contr->orig_stats = stats;	849	contr->orig_stats = stats;
848	}	850	}
		851	}
		852
		853	static void
		854	start_info (object *op)
		855	{
		856	char buf[MAX_BUF];
		857
		858	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		859	new_draw_info (NDI_UNIQUE, 0, op, buf);
		860	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		861	//new_draw_info (NDI_UNIQUE, 0, op, " ");
849	}	862	}
850		863
851	/* This function takes the key that is passed, and does the	864	/* This function takes the key that is passed, and does the
852	* appropriate action with it (change race, or other things).	865	* appropriate action with it (change race, or other things).
853	* The function name is for historical reasons - now we have	866	* The function name is for historical reasons - now we have
…		…
882	* to save here.	895	* to save here.
883	*/	896	*/
884	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	897	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
885	make_path_to_file (buf);	898	make_path_to_file (buf);
886		899
887	#ifdef AUTOSAVE
888	op->contr->last_save_tick = pticks;
889	#endif
890	start_info (op);	900	start_info (op);
891	CLEAR_FLAG (op, FLAG_WIZ);	901	CLEAR_FLAG (op, FLAG_WIZ);
892	give_initial_items (op, op->randomitems);	902	give_initial_items (op, op->randomitems);
893	link_player_skills (op);	903	link_player_skills (op);
894	esrv_send_inventory (op, op);	904	esrv_send_inventory (op, op);
…		…
900	if (*first_map_ext_path)	910	if (*first_map_ext_path)
901	{	911	{
902	object *tmp;	912	object *tmp;
903	char mapname[MAX_BUF];	913	char mapname[MAX_BUF];
904		914
905	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, &op->arch->name);
906	tmp = object::create ();	916	tmp = object::create ();
907	EXIT_PATH (tmp) = mapname;	917	EXIT_PATH (tmp) = mapname;
908	EXIT_X (tmp) = op->x;	918	EXIT_X (tmp) = op->x;
909	EXIT_Y (tmp) = op->y;	919	EXIT_Y (tmp) = op->y;
910	enter_exit (op, tmp); /* we don't really care if it succeeded;	920	op->enter_exit (tmp); /* we don't really care if it succeeded;
911	* if the map isn't there, then stay on the	921	* if the map isn't there, then stay on the
912	* default initial map */	922	* default initial map */
913	tmp->destroy ();	923	tmp->destroy ();
914	}	924	}
915	else	925	else
…		…
956		966
957	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	967	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
958	return 0;	968	return 0;
959	}	969	}
960		970
961	int
962	key_confirm_quit (object *op, char key)
963	{
964	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
965	{
966	op->contr->ns->state = ST_PLAYING;
967	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
968	return 1;
969	}
970
971	INVOKE_PLAYER (LOGOUT, op->contr);
972	INVOKE_PLAYER (QUIT, op->contr);
973
974	op->contr->enable_save = false;
975
976	terminate_all_pets (op);
977	leave_map (op);
978	op->direction = 0;
979	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
980
981	strcpy (op->contr->killer, "quit");
982	check_score (op);
983	op->contr->party = 0;
984	op->contr->own_title[0] = '\0';
985
986	object_ptr ob = op;
987
988	/* We need to hunt for any per player unique maps in memory and
989	* get rid of them. The trailing slash in the path is intentional,
990	* so that players named 'Ab' won't match against players 'Abe' pathname
991	*/
992	char buf[MAX_BUF];
993	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
994
995	for (maptile next, mp = first_map; mp; mp = next)
996	{
997	next = mp->next;
998
999	if (!strncmp (mp->path, buf, strlen (buf)))
1000	delete_map (mp);
1001	}
1002
1003	delete_character (ob->name, 1);
1004	ob->contr->destroy ();
1005
1006	return 1;
1007	}
1008
1009	void	971	void
1010	flee_player (object *op)	972	flee_player (object *op)
1011	{	973	{
1012	int dir, diff;	974	int dir, diff;
1013	rv_vector rv;	975	rv_vector rv;
…		…
1068	int	1030	int
1069	check_pick (object *op)	1031	check_pick (object *op)
1070	{	1032	{
1071	object tmp, next;	1033	object tmp, next;
1072	int stop = 0;	1034	int stop = 0;
1073	int j, k, wvratio;	1035	int wvratio;
1074	char putstring[128], tmpstr[16];	1036	char putstring[128];
1075		1037
1076	/* if you're flying, you cna't pick up anything */	1038	/* if you're flying, you cna't pick up anything */
1077	if (op->move_type & MOVE_FLYING)	1039	if (op->move_type & MOVE_FLYING)
1078	return 1;	1040	return 1;
1079		1041
…		…
1416	* found object is returned.	1378	* found object is returned.
1417	*/	1379	*/
1418	object *	1380	object *
1419	find_arrow (object op, const char type)	1381	find_arrow (object op, const char type)
1420	{	1382	{
1421	object *tmp = NULL;	1383	object *tmp = 0;
1422		1384
1423	for (op = op->inv; op; op = op->below)	1385	for (op = op->inv; op; op = op->below)
1424	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))	1386	if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1425	tmp = find_arrow (op, type);	1387	tmp = find_arrow (op, type);
1426	else if (op->type == ARROW && op->race == type)	1388	else if (op->type == ARROW && op->race == type)
1427	return op;	1389	return op;
		1390
1428	return tmp;	1391	return tmp;
1429	}	1392	}
1430		1393
1431	/*	1394	/*
1432	* Similar to find_arrow, but looks for (roughly) the best arrow to use	1395	* Similar to find_arrow, but looks for (roughly) the best arrow to use
1433	* against the target. A full test is not performed, simply a basic test	1396	* against the target. A full test is not performed, simply a basic test
1434	* of resistances. The archer is making a quick guess at what he sees down	1397	* of resistances. The archer is making a quick guess at what he sees down
1435	* the hall. Failing that it does it's best to pick the highest plus arrow.	1398	* the hall. Failing that it does it's best to pick the highest plus arrow.
1436	*/	1399	*/
1437
1438	object *	1400	object *
1439	find_better_arrow (object op, object target, const char type, int better)	1401	find_better_arrow (object op, object target, const char type, int better)
1440	{	1402	{
1441	object tmp = NULL, arrow, *ntmp;	1403	object tmp = NULL, arrow, *ntmp;
1442	int attacknum, attacktype, betterby = 0, i;	1404	int attacknum, attacktype, betterby = 0, i;
…		…
1665	return 0;	1627	return 0;
1666	}	1628	}
1667		1629
1668	arrow->set_owner (op);	1630	arrow->set_owner (op);
1669	arrow->skill = bow->skill;	1631	arrow->skill = bow->skill;
1670
1671	arrow->direction = dir;	1632	arrow->direction = dir;
1672	arrow->x = sx;
1673	arrow->y = sy;
1674		1633
1675	if (op->type == PLAYER)	1634	if (op->type == PLAYER)
1676	{	1635	{
1677	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1636	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1678	op->update_stats ();	1637	op->update_stats ();
…		…
1716	arrow->attacktype \|= bow->attacktype;	1675	arrow->attacktype \|= bow->attacktype;
1717		1676
1718	if (bow->slaying)	1677	if (bow->slaying)
1719	arrow->slaying = bow->slaying;	1678	arrow->slaying = bow->slaying;
1720		1679
1721	arrow->map = m;
1722	arrow->move_type = MOVE_FLY_LOW;	1680	arrow->move_type = MOVE_FLY_LOW;
1723	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1681	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1724		1682
1725	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1683	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1726	insert_ob_in_map (arrow, m, op, 0);	1684	m->insert (arrow, sx, sy, op);
1727		1685
1728	if (!arrow->destroyed ())	1686	if (!arrow->destroyed ())
1729	move_arrow (arrow);	1687	move_arrow (arrow);
1730		1688
1731	if (op->type == PLAYER)	1689	if (op->type == PLAYER)
…		…
1757	}	1715	}
1758	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1716	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1759	{	1717	{
1760	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1718	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1761	wcmod = -1;	1719	wcmod = -1;
		1720
1762	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1721	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1763	}	1722	}
1764	else if (op->contr->bowtype == bow_threewide)	1723	else if (op->contr->bowtype == bow_threewide)
1765	{	1724	{
1766	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1725	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1893	{	1852	{
1894	if (op->type == PLAYER)	1853	if (op->type == PLAYER)
1895	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");	1854	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1896	return;	1855	return;
1897	}	1856	}
		1857
1898	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1858	do_skill (op, op, op->chosen_skill, dir, NULL);
1899	return;	1859	return;
1900	case range_builder:	1860	case range_builder:
1901	apply_map_builder (op, dir);	1861	apply_map_builder (op, dir);
1902	return;	1862	return;
1903	default:	1863	default:
1904	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");	1864	new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1905	return;	1865	return;
1906	}	1866	}
1907	}	1867	}
1908
1909
1910		1868
1911	/* find_key	1869	/* find_key
1912	* We try to find a key for the door as passed. If we find a key	1870	* We try to find a key for the door as passed. If we find a key
1913	* and successfully use it, we return the key, otherwise NULL	1871	* and successfully use it, we return the key, otherwise NULL
1914	* This function merges both normal and locked door, since the logic	1872	* This function merges both normal and locked door, since the logic
…		…
1916	* pl is the player,	1874	* pl is the player,
1917	* inv is the objects inventory to searched	1875	* inv is the objects inventory to searched
1918	* door is the door we are trying to match against.	1876	* door is the door we are trying to match against.
1919	* This function can be called recursively to search containers.	1877	* This function can be called recursively to search containers.
1920	*/	1878	*/
1921
1922	object *	1879	object *
1923	find_key (object pl, object container, object *door)	1880	find_key (object pl, object container, object *door)
1924	{	1881	{
1925	object tmp, key;	1882	object tmp, key;
1926		1883
1927	/* Should not happen, but sanity checking is never bad */	1884	/* Should not happen, but sanity checking is never bad */
1928	if (container->inv == NULL)	1885	if (!container->inv)
1929	return NULL;	1886	return 0;
1930		1887
1931	/* First, lets try to find a key in the top level inventory */	1888	/* First, lets try to find a key in the top level inventory */
1932	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1889	for (tmp = container->inv; tmp; tmp = tmp->below)
1933	{	1890	{
1934	if (door->type == DOOR && tmp->type == KEY)	1891	if (door->type == DOOR && tmp->type == KEY)
1935	break;	1892	break;
1936	/* For sanity, we should really check door type, but other stuff	1893	/* For sanity, we should really check door type, but other stuff
1937	* (like containers) can be locked with special keys	1894	* (like containers) can be locked with special keys
1938	*/	1895	*/
1939	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)	1896	if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1940	break;	1897	break;
1941	}	1898	}
		1899
1942	/* No key found - lets search inventories now */	1900	/* No key found - lets search inventories now */
1943	/* If we find and use a key in an inventory, return at that time.	1901	/* If we find and use a key in an inventory, return at that time.
1944	* otherwise, if we search all the inventories and still don't find	1902	* otherwise, if we search all the inventories and still don't find
1945	* a key, return	1903	* a key, return
1946	*/	1904	*/
1947	if (!tmp)	1905	if (!tmp)
1948	{	1906	{
1949	for (tmp = container->inv; tmp != NULL; tmp = tmp->below)	1907	for (tmp = container->inv; tmp; tmp = tmp->below)
1950	{	1908	{
1951	/* No reason to search empty containers */	1909	/* No reason to search empty containers */
1952	if (tmp->type == CONTAINER && tmp->inv)	1910	if (tmp->type == CONTAINER && tmp->inv)
1953	{	1911	{
1954	if ((key = find_key (pl, tmp, door)) != NULL)	1912	if ((key = find_key (pl, tmp, door)))
1955	return key;	1913	return key;
1956	}	1914	}
1957	}	1915	}
		1916
1958	if (!tmp)	1917	if (!tmp)
1959	return NULL;	1918	return NULL;
1960	}	1919	}
		1920
1961	/* We get down here if we have found a key. Now if its in a container,	1921	/* We get down here if we have found a key. Now if its in a container,
1962	* see if we actually want to use it	1922	* see if we actually want to use it
1963	*/	1923	*/
1964	if (pl != container)	1924	if (pl != container)
1965	{	1925	{
…		…
1986	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,	1946	new_draw_info_format (NDI_UNIQUE \| NDI_BROWN, 0, pl,
1987	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));	1947	"The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1988	return NULL;	1948	return NULL;
1989	}	1949	}
1990	}	1950	}
		1951
1991	return tmp;	1952	return tmp;
1992	}	1953	}
1993		1954
1994	/* moved door processing out of move_player_attack.	1955	/* moved door processing out of move_player_attack.
1995	* returns 1 if player has opened the door with a key	1956	* returns 1 if player has opened the door with a key
…		…
2013	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);	1974	play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2014	if (action_makes_visible (op))	1975	if (action_makes_visible (op))
2015	make_visible (op);	1976	make_visible (op);
2016	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))	1977	if (door->inv && (door->inv->type == RUNE \|\| door->inv->type == TRAP))
2017	spring_trap (door->inv, op);	1978	spring_trap (door->inv, op);
		1979
2018	if (door->type == DOOR)	1980	if (door->type == DOOR)
2019	{
2020	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */	1981	hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2021	}
2022	else if (door->type == LOCKED_DOOR)	1982	else if (door->type == LOCKED_DOOR)
2023	{	1983	{
2024	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));	1984	new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2025	remove_door2 (door); /* remove door without violence ;-) */	1985	remove_door2 (door); /* remove door without violence ;-) */
2026	}	1986	}
		1987
2027	/* Do this after we print the message */	1988	/* Do this after we print the message */
2028	decrease_ob (key); /* Use up one of the keys */	1989	decrease_ob (key); /* Use up one of the keys */
2029	/* Need to update the weight the container the key was in */	1990	/* Need to update the weight the container the key was in */
2030	if (container != op)	1991	if (container != op)
2031	esrv_update_item (UPD_WEIGHT, op, container);	1992	esrv_update_item (UPD_WEIGHT, op, container);
		1993
2032	return 1; /* Nothing more to do below */	1994	return 1; /* Nothing more to do below */
2033	}	1995	}
2034	else if (door->type == LOCKED_DOOR)	1996	else if (door->type == LOCKED_DOOR)
2035	{	1997	{
2036	/* Might as well return now - no other way to open this */	1998	/* Might as well return now - no other way to open this */
2037	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);	1999	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, door->msg);
2038	return 1;	2000	return 1;
2039	}	2001	}
		2002
2040	return 0;	2003	return 0;
2041	}	2004	}
2042		2005
2043	/* This function is just part of a breakup from move_player.	2006	/* This function is just part of a breakup from move_player.
2044	* It should keep the code cleaner.	2007	* It should keep the code cleaner.
…		…
2070	*/	2033	*/
2071	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2034	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2072	{	2035	{
2073	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2036	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2074	{	2037	{
2075	m = get_map_from_coord (op->map, &nx, &ny);	2038	m = op->map->xy_find (nx, ny);
2076	if (!m)	2039	if (!m)
2077	return; /* Don't think this should happen */	2040	return; /* Don't think this should happen */
2078	}	2041	}
2079	else	2042	else
2080	m = op->map;	2043	m = op->map;
2081		2044
2082	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2045	if (!(tmp = m->at (nx, ny).bot))
2083	{
2084	/* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2085	return;	2046	return;
2086	}
2087		2047
2088	mon = 0;	2048	mon = 0;
2089	/* Go through all the objects, and find ones of interest. Only stop if	2049	/* Go through all the objects, and find ones of interest. Only stop if
2090	* we find a monster - that is something we know we want to attack.	2050	* we find a monster - that is something we know we want to attack.
2091	* if its a door or barrel (can roll) see if there may be monsters	2051	* if its a door or barrel (can roll) see if there may be monsters
…		…
2144	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))	2104	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2145	{	2105	{
2146	/* If we're braced, we don't want to switch places with it */	2106	/* If we're braced, we don't want to switch places with it */
2147	if (op->contr->braced)	2107	if (op->contr->braced)
2148	return;	2108	return;
		2109
2149	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2110	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2150	(void) push_ob (mon, dir, op);	2111	(void) push_ob (mon, dir, op);
2151	if (op->contr->tmp_invis \|\| op->hide)	2112	if (op->contr->tmp_invis \|\| op->hide)
2152	make_visible (op);	2113	make_visible (op);
		2114
2153	return;	2115	return;
2154	}	2116	}
2155		2117
2156	/* in certain circumstances, you shouldn't attack friendly	2118	/* in certain circumstances, you shouldn't attack friendly
2157	* creatures. Note that if you are braced, you can't push	2119	* creatures. Note that if you are braced, you can't push
…		…
2171	!on_battleground))	2133	!on_battleground))
2172	{	2134	{
2173	if (!op->contr->braced)	2135	if (!op->contr->braced)
2174	{	2136	{
2175	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2137	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2176	(void) push_ob (mon, dir, op);	2138	push_ob (mon, dir, op);
2177	}	2139	}
2178	else	2140	else
2179	new_draw_info (0, 0, op, "You withhold your attack");	2141	new_draw_info (0, 0, op, "You withhold your attack");
2180		2142
2181	if (op->contr->tmp_invis \|\| op->hide)	2143	if (op->contr->tmp_invis \|\| op->hide)
…		…
2196	* Way it works is like this: First, it must have some hit points	2158	* Way it works is like this: First, it must have some hit points
2197	* and be living. Then, it must be one of the following:	2159	* and be living. Then, it must be one of the following:
2198	* 1) Not a player, 2) A player, but of a different party. Note	2160	* 1) Not a player, 2) A player, but of a different party. Note
2199	* that party_number -1 is no party, so attacks can still happen.	2161	* that party_number -1 is no party, so attacks can still happen.
2200	*/	2162	*/
2201
2202	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2163	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2203	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))	2164	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2204	{	2165	{
2205		2166
2206	/* If the player hasn't hit something this tick, and does	2167	/* If the player hasn't hit something this tick, and does
…		…
2240	int	2201	int
2241	move_player (object *op, int dir)	2202	move_player (object *op, int dir)
2242	{	2203	{
2243	int pick;	2204	int pick;
2244		2205
2245	if (op->map == NULL \|\| op->map->in_memory != MAP_IN_MEMORY)	2206	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
2246	return 0;	2207	return 0;
2247		2208
2248	/* Sanity check: make sure dir is valid */	2209	/* Sanity check: make sure dir is valid */
2249	if ((dir < 0) \|\| (dir >= 9))	2210	if ((dir < 0) \|\| (dir >= 9))
2250	{	2211	{
2251	LOG (llevError, "move_player: invalid direction %d\n", dir);	2212	LOG (llevError, "move_player: invalid direction %d\n", dir);
2252	return 0;	2213	return 0;
2253	}	2214	}
2254		2215
2255	/* peterm: added following line */	2216	/* peterm: added following line */
2256	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2217	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2257	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2218	dir = absdir (dir + rndm (3) + rndm (3) - 2);
2258		2219
2259	op->facing = dir;	2220	op->facing = dir;
2260		2221
2261	if (op->hide)	2222	if (op->hide)
2262	do_hidden_move (op);	2223	do_hidden_move (op);
…		…
2338		2299
2339	/* call this here - we also will call this in do_ericserver, but	2300	/* call this here - we also will call this in do_ericserver, but
2340	* the players time has been increased when doericserver has been	2301	* the players time has been increased when doericserver has been
2341	* called, so we recheck it here.	2302	* called, so we recheck it here.
2342	*/	2303	*/
2343	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2304	if (op->contr->ns->handle_command ())
2344	for (int rep = 8; --rep && op->contr->ns->handle_command (); )	2305	return 1;
2345	;
2346		2306
2347	if (op->speed_left < 0)	2307	if (op->speed_left > 0)
2348	return 0;	2308	{
2349
2350	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2309	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2351	{	2310	{
2352	/* All move commands take 1 tick, at least for now */	2311	/* All move commands take 1 tick, at least for now */
2353	op->speed_left--;	2312	op->speed_left--;
2354		2313
2355	/* Instead of all the stuff below, let move_player take care	2314	/* Instead of all the stuff below, let move_player take care
2356	* of it. Also, some of the skill stuff is only put in	2315	* of it. Also, some of the skill stuff is only put in
2357	* there, as well as the confusion stuff.	2316	* there, as well as the confusion stuff.
2358	*/	2317	*/
2359	move_player (op, op->direction);	2318	move_player (op, op->direction);
2360	if (op->speed_left > 0)	2319
2361	return 1;	2320	return op->speed_left > 0;
2362	else	2321	}
2363	return 0;
2364	}	2322	}
2365		2323
2366	return 0;	2324	return 0;
2367	}	2325	}
2368		2326
…		…
2406	* from.	2364	* from.
2407	*/	2365	*/
2408	void	2366	void
2409	remove_unpaid_objects (object op, object env)	2367	remove_unpaid_objects (object op, object env)
2410	{	2368	{
2411	object *next;
2412
2413	while (op)	2369	while (op)
2414	{	2370	{
2415	next = op->below; /* Make sure we have a good value, in case	2371	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2416	* we remove object 'op'	2372
2417	*/
2418	if (QUERY_FLAG (op, FLAG_UNPAID))	2373	if (QUERY_FLAG (op, FLAG_UNPAID))
2419	{	2374	{
2420	op->remove ();
2421	op->x = env->x;
2422	op->y = env->y;
2423	if (env->type == PLAYER)	2375	if (env->type == PLAYER)
2424	esrv_del_item (env->contr, op->count);	2376	esrv_del_item (env->contr, op->count);
2425	insert_ob_in_map (op, env->map, NULL, 0);	2377
		2378	op->insert_at (env);
2426	}	2379	}
2427	else if (op->inv)	2380	else if (op->inv)
2428	remove_unpaid_objects (op->inv, env);	2381	remove_unpaid_objects (op->inv, env);
2429		2382
2430	op = next;	2383	op = next;
…		…
2723	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2676	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");
2724	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");	2677	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2725		2678
2726	/* restore player */	2679	/* restore player */
2727	at = archetype::find ("poisoning");	2680	at = archetype::find ("poisoning");
2728	tmp = present_arch_in_ob (at, op);	2681	if (object *tmp = present_arch_in_ob (at, op))
2729	if (tmp)
2730	{	2682	{
2731	tmp->destroy ();	2683	tmp->destroy ();
2732	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2684	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2733	}	2685	}
2734		2686
2735	at = archetype::find ("confusion");	2687	at = archetype::find ("confusion");
2736	tmp = present_arch_in_ob (at, op);	2688	if (object *tmp = present_arch_in_ob (at, op))
2737	if (tmp)
2738	{	2689	{
2739	tmp->destroy ();	2690	tmp->destroy ();
2740	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2691	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2741	}	2692	}
2742		2693
…		…
2744	op->stats.hp = op->stats.maxhp;	2695	op->stats.hp = op->stats.maxhp;
2745	if (op->stats.food <= 0)	2696	if (op->stats.food <= 0)
2746	op->stats.food = 999;	2697	op->stats.food = 999;
2747		2698
2748	/* create a bodypart-trophy to make the winner happy */	2699	/* create a bodypart-trophy to make the winner happy */
2749	tmp = arch_to_object (archetype::find ("finger"));	2700	if (object *tmp = arch_to_object (archetype::find ("finger")))
2750	if (tmp != NULL)
2751	{	2701	{
2752	sprintf (buf, "%s's finger", &op->name);	2702	sprintf (buf, "%s's finger", &op->name);
2753	tmp->name = buf;	2703	tmp->name = buf;
2754	sprintf (buf, " This finger has been cut off %s\n"	2704	sprintf (buf, " This finger has been cut off %s\n"
2755	" the %s, when he was defeated at\n level %d by %s.\n",	2705	" the %s, when he was defeated at\n level %d by %s.\n",
2756	&op->name, op->contr->title, (int) (op->level), op->contr->killer);	2706	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2757	tmp->msg = buf;	2707	tmp->msg = buf;
2758	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2708	tmp->value = 0, tmp->type = 0;
2759	tmp->materialname = NULL;	2709	tmp->materialname = "organics";
2760	tmp->x = op->x, tmp->y = op->y;	2710	tmp->insert_at (op, tmp);
2761	insert_ob_in_map (tmp, op->map, op, 0);
2762	}	2711	}
2763		2712
2764	/* teleport defeated player to new destination */	2713	/* teleport defeated player to new destination */
2765	transfer_ob (op, x, y, 0, NULL);	2714	transfer_ob (op, x, y, 0, NULL);
2766	op->contr->braced = 0;	2715	op->contr->braced = 0;
…		…
2771		2720
2772	command_kill_pets (op, 0);	2721	command_kill_pets (op, 0);
2773		2722
2774	if (op->stats.food < 0)	2723	if (op->stats.food < 0)
2775	{	2724	{
2776	if (op->contr->explore)
2777	{
2778	new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2779	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2780	op->stats.food = 999;
2781	return;
2782	}
2783	sprintf (buf, "%s starved to death.", &op->name);	2725	sprintf (buf, "%s starved to death.", &op->name);
2784	strcpy (op->contr->killer, "starvation");	2726	strcpy (op->contr->killer, "starvation");
2785	}	2727	}
2786	else	2728	else
2787	{
2788	if (op->contr->explore)
2789	{
2790	new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2791	new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2792	op->stats.hp = op->stats.maxhp;
2793	return;
2794	}
2795	sprintf (buf, "%s died.", &op->name);	2729	sprintf (buf, "%s died.", &op->name);
2796	}	2730
2797	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2731	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2798		2732
2799	/* save the map location for corpse, gravestone */	2733	/* save the map location for corpse, gravestone */
2800	x = op->x;	2734	x = op->x;
2801	y = op->y;	2735	y = op->y;
2802	map = op->map;	2736	map = op->map;
2803
2804		2737
2805	/* NOT_PERMADEATH code. This basically brings the character back to	2738	/* NOT_PERMADEATH code. This basically brings the character back to
2806	* life if they are dead - it takes some exp and a random stat.	2739	* life if they are dead - it takes some exp and a random stat.
2807	* See the config.h file for a little more in depth detail about this.	2740	* See the config.h file for a little more in depth detail about this.
2808	*/	2741	*/
…		…
2825	num_stats_lose = 1;	2758	num_stats_lose = 1;
2826	else	2759	else
2827	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2760	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2828	}	2761	}
2829	else	2762	else
2830	{
2831	num_stats_lose = 1;	2763	num_stats_lose = 1;
2832	}	2764
2833	lost_a_stat = 0;	2765	lost_a_stat = 0;
2834		2766
2835	for (z = 0; z < num_stats_lose; z++)	2767	for (z = 0; z < num_stats_lose; z++)
2836	{	2768	{
2837	i = RANDOM () % NUM_STATS;	2769	i = RANDOM () % NUM_STATS;
…		…
2995	/* */	2927	/* */
2996	/****************************************/	2928	/****************************************/
2997		2929
2998	enter_player_savebed (op);	2930	enter_player_savebed (op);
2999		2931
3000	/* Save the player before inserting the force to reduce
3001	* chance of abuse.
3002	*/
3003	op->contr->braced = 0;	2932	op->contr->braced = 0;
3004	op->contr->save ();
3005		2933
3006	/* it is possible that the player has blown something up	2934	/* it is possible that the player has blown something up
3007	* at his savebed location, and that can have long lasting	2935	* at his savebed location, and that can have long lasting
3008	* spell effects. So first see if there is a spell effect	2936	* spell effects. So first see if there is a spell effect
3009	* on the space that might harm the player.	2937	* on the space that might harm the player.
…		…
3038	void	2966	void
3039	loot_object (object *op)	2967	loot_object (object *op)
3040	{ /* Grab and destroy some treasure */	2968	{ /* Grab and destroy some treasure */
3041	object tmp, tmp2, *next;	2969	object tmp, tmp2, *next;
3042		2970
3043	if (op->container)	2971	op->close_container (); /* close open sack first */
3044	esrv_apply_container (op, op->container); /* close open sack first */
3045		2972
3046	for (tmp = op->inv; tmp; tmp = next)	2973	for (tmp = op->inv; tmp; tmp = next)
3047	{	2974	{
3048	next = tmp->below;	2975	next = tmp->below;
3049		2976
3050	if (tmp->invisible)	2977	if (tmp->invisible)
3051	continue;	2978	continue;
3052		2979
3053	tmp->remove ();	2980	tmp->remove ();
3054	tmp->x = op->x, tmp->y = op->y;	2981	tmp->x = op->x, tmp->y = op->y;
		2982
3055	if (tmp->type == CONTAINER)	2983	if (tmp->type == CONTAINER)
3056	{ /* empty container to ground */	2984	loot_object (tmp); /* empty container to ground */
3057	loot_object (tmp);	2985
3058	}
3059	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(RANDOM () % 3)))	2986	if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) \|\| QUERY_FLAG (tmp, FLAG_NO_DROP) \|\| !(rndm (3))))
3060	{	2987	{
3061	if (tmp->nrof > 1)	2988	if (tmp->nrof > 1)
3062	{	2989	{
3063	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));	2990	tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3064	tmp2->destroy ();	2991	tmp2->destroy ();
…		…
3075	/*	3002	/*
3076	* fix_weight(): Check recursively the weight of all players, and fix	3003	* fix_weight(): Check recursively the weight of all players, and fix
3077	* what needs to be fixed. Refresh windows and fix speed if anything	3004	* what needs to be fixed. Refresh windows and fix speed if anything
3078	* was changed.	3005	* was changed.
3079	*/	3006	*/
3080
3081	void	3007	void
3082	fix_weight (void)	3008	fix_weight (void)
3083	{	3009	{
3084	for_all_players (pl)	3010	for_all_players (pl)
3085	{	3011	{
…		…
3151	}	3077	}
3152		3078
3153	int	3079	int
3154	is_true_undead (object *op)	3080	is_true_undead (object *op)
3155	{	3081	{
3156	object *tmp = NULL;
3157
3158	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))	3082	if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3159	return 1;	3083	return 1;
3160		3084
3161	return 0;	3085	return 0;
3162	}	3086	}
…		…
3221		3145
3222	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);	3146	skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3223		3147
3224	/* its extremely hard to run and sneak/hide at the same time! */	3148	/* its extremely hard to run and sneak/hide at the same time! */
3225	if (op->type == PLAYER && op->contr->run_on)	3149	if (op->type == PLAYER && op->contr->run_on)
3226	{
3227	if (!skop \|\| num >= skop->level)	3150	if (!skop \|\| num >= skop->level)
3228	{	3151	{
3229	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");	3152	new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3230	make_visible (op);	3153	make_visible (op);
3231	return;	3154	return;
3232	}	3155	}
3233	else	3156	else
3234	num += 20;	3157	num += 20;
3235	}	3158
3236	num += op->map->difficulty;	3159	num += op->map->difficulty;
3237	hide = hideability (op); /* modify by terrain hidden level */	3160	hide = hideability (op); /* modify by terrain hidden level */
3238	num -= hide;	3161	num -= hide;
		3162
3239	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))	3163	if ((op->type == PLAYER && hide < -10) \|\| ((op->invisible -= num) <= 0))
3240	{	3164	{
3241	make_visible (op);	3165	make_visible (op);
3242	if (op->type == PLAYER)	3166	if (op->type == PLAYER)
3243	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");	3167	new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3244	}	3168	}
3245	else if (op->type == PLAYER && skop)	3169	else if (op->type == PLAYER && skop)
3246	{
3247	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);	3170	change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3248	}
3249	}	3171	}
3250		3172
3251	/* determine if who is standing near a hostile creature. */	3173	/* determine if who is standing near a hostile creature. */
3252		3174
3253	int	3175	int
…		…
3320	if (pl->type != PLAYER)	3242	if (pl->type != PLAYER)
3321	{	3243	{
3322	LOG (llevError, "player_can_view() called for non-player object\n");	3244	LOG (llevError, "player_can_view() called for non-player object\n");
3323	return -1;	3245	return -1;
3324	}	3246	}
		3247
3325	if (!pl \|\| !op)	3248	if (!pl \|\| !op)
3326	return 0;	3249	return 0;
3327		3250
3328	if (op->head)
3329	{
3330	op = op->head;	3251	op = op->head_ ();
3331	}	3252
3332	get_rangevector (pl, op, &rv, 0x1);	3253	get_rangevector (pl, op, &rv, 0x1);
3333		3254
3334	/* starting with the 'head' part, lets loop	3255	/* starting with the 'head' part, lets loop
3335	* through the object and find if it has any	3256	* through the object and find if it has any
3336	* part that is in the los array but isnt on	3257	* part that is in the los array but isnt on
…		…
3466	if (trlist == NULL \|\| who->type != PLAYER)	3387	if (trlist == NULL \|\| who->type != PLAYER)
3467	return;	3388	return;
3468		3389
3469	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);	3390	for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3470		3391
3471	if (tr == NULL \|\| tr->item == NULL)	3392	if (!tr \|\| !tr->item)
3472	{	3393	{
3473	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */	3394	/* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3474	return;	3395	return;
3475	}	3396	}
3476		3397
…		…
3601	* not readied.	3522	* not readied.
3602	*/	3523	*/
3603	void	3524	void
3604	player_unready_range_ob (player pl, object ob)	3525	player_unready_range_ob (player pl, object ob)
3605	{	3526	{
3606	rangetype i;
3607
3608	for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))	3527	for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3609	{
3610	if (pl->ranges[i] == ob)	3528	if (pl->ranges[i] == ob)
3611	{	3529	{
3612	pl->ranges[i] = NULL;	3530	pl->ranges[i] = 0;
3613	if (pl->shoottype == i)	3531	if (pl->shoottype == i)
3614	{
3615	pl->shoottype = range_none;	3532	pl->shoottype = range_none;
3616	}
3617	}	3533	}
3618	}
3619	}	3534	}
		3535
		3536	sint8
		3537	player::visibility_at (maptile *map, int x, int y) const
		3538	{
		3539	if (!ns)
		3540	return 0;
		3541
		3542	int dx, dy;
		3543	if (!adjacent_map (map, ns->current_map, &dx, &dy))
		3544	return 0;
		3545
		3546	x += dx - ns->current_x + ns->mapx / 2;
		3547	y += dy - ns->current_y + ns->mapy / 2;
		3548
		3549	if (!IN_RANGE_EXC (x, 0, ns->mapx) \|\| !IN_RANGE_EXC (y, 0, ns->mapy))
		3550	return 0;
		3551
		3552	return 100 - blocked_los [x][y];
		3553	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.68 by root, Tue Dec 26 09:52:40 2006 UTC vs. Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.68 by root, Tue Dec 26 09:52:40 2006 UTC vs.
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC