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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.64 by root, Tue Dec 26 03:35:59 2006 UTC vs.
Revision 1.96 by root, Mon Jan 8 19:25:53 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];
…		…
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	ob->remove ();
		200	ob->map = 0;
		201
		202	// for weird reasons, this is often "ob", keeping a circular reference
		203	ranges [range_skill] = 0;
		204
		205	players.erase (this);
167	}	206	}
168		207
169	// connect the player with a specific client	208	// connect the player with a specific client
170	// also changed, rationalises, and fixes some incorrect settings	209	// also changed, rationalises, and fixes some incorrect settings
171	void	210	void
172	player::connect (client *ns)	211	player::connect (client *ns)
173	{	212	{
174	this->ns = ns;	213	this->ns = ns;
175	ns->pl = this;	214	ns->pl = this;
176		215
177	next = first_player;	216	run_on = 0;
178	first_player = this;	217	fire_on = 0;
179		218
180	ns->update_look = 0;	219	ns->update_look = 0;
181	ns->look_position = 0;	220	ns->look_position = 0;
182		221
183	clear_los (ob);	222	clear_los (ob);
		223
		224	ns->reset_stats ();
184		225
185	/* make sure he's a player -- needed because of class change. */	226	/* make sure he's a player -- needed because of class change. */
186	ob->type = PLAYER; // we are paranoid	227	ob->type = PLAYER; // we are paranoid
187	ob->race = ob->arch->clone.race;	228	ob->race = ob->arch->clone.race;
188		229
…		…
191		232
192	ob->carrying = sum_weight (ob);	233	ob->carrying = sum_weight (ob);
193	link_player_skills (ob);	234	link_player_skills (ob);
194		235
195	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);	236	CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196	update_ob_speed (ob);
197		237
198	assign (title, ob->arch->clone.name);	238	assign (title, ob->arch->clone.name);
199		239
200	/* can_use_shield is a new flag. However, the can_use.. seems to largely come	240	/* 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	241	* from the class, and not race. I don't see any way to get the class information
…		…
223	skin = tmp;	263	skin = tmp;
224		264
225	set_dragon_name (ob, abil, skin);	265	set_dragon_name (ob, abil, skin);
226	}	266	}
227		267
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!");	268	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		269
236	esrv_new_player (this, ob->weight + ob->carrying);	270	esrv_new_player (this, ob->weight + ob->carrying);
237		271
238	ob->update_stats ();	272	ob->update_stats ();
239	ns->floorbox_update ();	273	ns->floorbox_update ();
240		274
241	esrv_send_inventory (ob, ob);	275	esrv_send_inventory (ob, ob);
242	esrv_add_spells (this, 0);	276	esrv_add_spells (this, 0);
243		277
244	enter_exit (ob, 0);	278	activate ();
245		279
246	send_rules (ob);	280	send_rules (ob);
247	send_news (ob);	281	send_news (ob);
248	display_motd (ob);	282	display_motd (ob);
		283
		284	INVOKE_PLAYER (CONNECT, this);
249	INVOKE_PLAYER (LOGIN, this);	285	INVOKE_PLAYER (LOGIN, this);
250	}	286	}
251		287
252	void	288	void
253	player::disconnect ()	289	player::disconnect ()
254	{	290	{
255	//TODO: don't be so harsh and destroy :)
256	if (ns)	291	if (ns)
257	destroy ();	292	{
		293	if (active)
		294	INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
		295
		296	INVOKE_PLAYER (DISCONNECT, this);
		297
		298	ns->pl = 0;
		299	this->ns = 0;
		300	}
		301
		302	deactivate ();
258	}	303	}
259		304
260	// the need for this function can be explained	305	// the need for this function can be explained
261	// by load_object not returning the object	306	// by load_object not returning the object
262	void	307	void
…		…
269	ob->speed = 1.0;	314	ob->speed = 1.0;
270	ob->direction = 5; /* So player faces south */	315	ob->direction = 5; /* So player faces south */
271	ob->stats.wc = 2;	316	ob->stats.wc = 2;
272	ob->run_away = 25; /* Then we panick... */	317	ob->run_away = 25; /* Then we panick... */
273		318
274	set_first_map (ob);
275
276	ob->roll_stats ();	319	ob->roll_stats ();
277	}	320	}
278		321
279	player::player ()	322	player::player ()
280	{	323	{
281	/* There are some elements we want initialized to non zero value -	324	/* There are some elements we want initialised to non zero value -
282	* we deal with that below this point.	325	* we deal with that below this point.
283	*/	326	*/
284	outputs_sync = 16; /* Every 2 seconds */	327	outputs_sync = 16; /* Every 2 seconds */
285	outputs_count = 8; /* Keeps present behaviour */	328	outputs_count = 8; /* Keeps present behaviour */
286	unapply = unapply_nochoice;	329	unapply = unapply_nochoice;
287		330
288	assign (savebed_map, first_map_path); /* Init. respawn position */	331	savebed_map = first_map_path; /* Init. respawn position */
289		332
290	gen_sp_armour = 10;	333	gen_sp_armour = 10;
291	last_speed = -1;
292	shoottype = range_none;	334	shoottype = range_none;
293	bowtype = bow_normal;	335	bowtype = bow_normal;
294	petmode = pet_normal;	336	petmode = pet_normal;
295	listening = 10;	337	listening = 10;
296	usekeys = containers;	338	usekeys = containers;
297	last_weapon_sp = -1;
298	peaceful = 1; /* default peaceful */	339	peaceful = 1; /* default peaceful */
299	do_los = 1;	340	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	}	341	}
315		342
316	void	343	void
317	player::do_destroy ()	344	player::do_destroy ()
318	{	345	{
		346	disconnect ();
		347
319	attachable::do_destroy ();	348	attachable::do_destroy ();
320		349
321	disconnect ();
322
323	terminate_all_pets (ob);
324
325	if (first_player != this)
326	{
327	player *prev = first_player;
328
329	while (prev && prev->next && prev->next != this)
330	prev = prev->next;
331
332	if (prev->next != this)
333	{
334	LOG (llevError, "Free_player: Can't find previous player.\n");
335	abort ();
336	}
337
338	prev->next = next;
339	}
340	else
341	first_player = next;
342
343	if (ob)	350	if (ob)
		351	{
344	ob->destroy (true);	352	ob->destroy_inv (false);
345
346	if (ns)
347	{
348	client *ns = this->ns;
349	ns->send_packet ("goodbye");
350	ns->flush ();
351	ns->pl = 0;
352	this->ns = 0;
353	ns->destroy ();	353	ob->destroy ();
354	}	354	}
355	}	355	}
356		356
357	player::~player ()	357	player::~player ()
358	{	358	{
…		…
368	player::create ()	368	player::create ()
369	{	369	{
370	player *pl = new player;	370	player *pl = new player;
371		371
372	pl->set_object (arch_to_object (get_player_archetype (0)));	372	pl->set_object (arch_to_object (get_player_archetype (0)));
		373	set_first_map (pl->ob);
373		374
374	return pl;	375	return pl;
375	}	376	}
376		377
377	/*	378	/*
…		…
408	object *op = NULL;	409	object *op = NULL;
409	objectlink *ol;	410	objectlink *ol;
410	unsigned lastdist;	411	unsigned lastdist;
411	rv_vector rv;	412	rv_vector rv;
412		413
413	for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)	414	for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
414	{	415	{
415	/* We should not find free objects on this friendly list, but it	416	/* We should not find free objects on this friendly list, but it
416	* does periodically happen. Given that, lets deal with it.	417	* does periodically happen. Given that, lets deal with it.
417	* While unlikely, it is possible the next object on the friendly	418	* While unlikely, it is possible the next object on the friendly
418	* list is also free, so encapsulate this in a while loop.	419	* list is also free, so encapsulate this in a while loop.
…		…
422	object *tmp = ol->ob;	423	object *tmp = ol->ob;
423		424
424	/* Can't do much more other than log the fact, because the object	425	/* Can't do much more other than log the fact, because the object
425	* itself will have been cleared.	426	* itself will have been cleared.
426	*/	427	*/
427	LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");	428	LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
		429	tmp->debug_desc ());
428	ol = ol->next;	430	ol = ol->next;
429	remove_friendly_object (tmp);	431	remove_friendly_object (tmp);
430	if (!ol)	432	if (!ol)
431	return op;	433	return op;
432	}	434	}
…		…
843		845
844	contr->orig_stats = stats;	846	contr->orig_stats = stats;
845	}	847	}
846	}	848	}
847		849
		850	static void
		851	start_info (object *op)
		852	{
		853	char buf[MAX_BUF];
		854
		855	sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
		856	new_draw_info (NDI_UNIQUE, 0, op, buf);
		857	//new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
		858	//new_draw_info (NDI_UNIQUE, 0, op, " ");
		859	}
		860
848	/* This function takes the key that is passed, and does the	861	/* This function takes the key that is passed, and does the
849	* appropriate action with it (change race, or other things).	862	* appropriate action with it (change race, or other things).
850	* The function name is for historical reasons - now we have	863	* The function name is for historical reasons - now we have
851	* separate race and class; this actually changes the RACE,	864	* separate race and class; this actually changes the RACE,
852	* not the class.	865	* not the class.
…		…
879	* to save here.	892	* to save here.
880	*/	893	*/
881	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);	894	sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
882	make_path_to_file (buf);	895	make_path_to_file (buf);
883		896
884	#ifdef AUTOSAVE
885	op->contr->last_save_tick = pticks;
886	#endif
887	start_info (op);	897	start_info (op);
888	CLEAR_FLAG (op, FLAG_WIZ);	898	CLEAR_FLAG (op, FLAG_WIZ);
889	give_initial_items (op, op->randomitems);	899	give_initial_items (op, op->randomitems);
890	link_player_skills (op);	900	link_player_skills (op);
891	esrv_send_inventory (op, op);	901	esrv_send_inventory (op, op);
…		…
897	if (*first_map_ext_path)	907	if (*first_map_ext_path)
898	{	908	{
899	object *tmp;	909	object *tmp;
900	char mapname[MAX_BUF];	910	char mapname[MAX_BUF];
901		911
902	snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);	912	snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
903	tmp = object::create ();	913	tmp = object::create ();
904	EXIT_PATH (tmp) = mapname;	914	EXIT_PATH (tmp) = mapname;
905	EXIT_X (tmp) = op->x;	915	EXIT_X (tmp) = op->x;
906	EXIT_Y (tmp) = op->y;	916	EXIT_Y (tmp) = op->y;
907	enter_exit (op, tmp); /* we don't really care if it succeeded;	917	op->enter_exit (tmp); /* we don't really care if it succeeded;
908	* if the map isn't there, then stay on the	918	* if the map isn't there, then stay on the
909	* default initial map */	919	* default initial map */
910	tmp->destroy ();	920	tmp->destroy ();
911	}	921	}
912	else	922	else
…		…
951	if (op->msg)	961	if (op->msg)
952	new_draw_info (NDI_BLUE, 0, op, op->msg);	962	new_draw_info (NDI_BLUE, 0, op, op->msg);
953		963
954	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");	964	send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
955	return 0;	965	return 0;
956	}
957
958	int
959	key_confirm_quit (object *op, char key)
960	{
961	if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
962	{
963	op->contr->ns->state = ST_PLAYING;
964	new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
965	return 1;
966	}
967
968	INVOKE_PLAYER (LOGOUT, op->contr);
969	INVOKE_PLAYER (QUIT, op->contr);
970
971	terminate_all_pets (op);
972	leave_map (op);
973	op->direction = 0;
974	new_draw_info_format (NDI_UNIQUE \| NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
975
976	strcpy (op->contr->killer, "quit");
977	check_score (op);
978	op->contr->party = 0;
979	op->contr->own_title[0] = '\0';
980
981	object_ptr ob = op;
982
983	delete ob->contr;
984
985	/* We need to hunt for any per player unique maps in memory and
986	* get rid of them. The trailing slash in the path is intentional,
987	* so that players named 'Ab' won't match against players 'Abe' pathname
988	*/
989	char buf[MAX_BUF];
990	sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
991
992	for (maptile next, mp = first_map; mp; mp = next)
993	{
994	next = mp->next;
995
996	if (!strncmp (mp->path, buf, strlen (buf)))
997	delete_map (mp);
998	}
999
1000	delete_character (ob->name, 1);
1001
1002	return 1;
1003	}	966	}
1004		967
1005	void	968	void
1006	flee_player (object *op)	969	flee_player (object *op)
1007	{	970	{
…		…
1661	return 0;	1624	return 0;
1662	}	1625	}
1663		1626
1664	arrow->set_owner (op);	1627	arrow->set_owner (op);
1665	arrow->skill = bow->skill;	1628	arrow->skill = bow->skill;
1666
1667	arrow->direction = dir;	1629	arrow->direction = dir;
1668	arrow->x = sx;
1669	arrow->y = sy;
1670		1630
1671	if (op->type == PLAYER)	1631	if (op->type == PLAYER)
1672	{	1632	{
1673	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;	1633	op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1674	op->update_stats ();	1634	op->update_stats ();
…		…
1689		1649
1690	/* update the speed */	1650	/* update the speed */
1691	arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?	1651	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;	1652	0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1693		1653
1694	if (arrow->speed < 1.0)	1654	arrow->set_speed (max (arrow->speed, 1.0));
1695	arrow->speed = 1.0;
1696	update_ob_speed (arrow);
1697	arrow->speed_left = 0;	1655	arrow->speed_left = 0;
1698		1656
1699	if (op->type == PLAYER)	1657	if (op->type == PLAYER)
1700	{	1658	{
1701	arrow->stats.wc = 20 - bow->magic - arrow->magic -	1659	arrow->stats.wc = 20 - bow->magic - arrow->magic -
…		…
1714	arrow->attacktype \|= bow->attacktype;	1672	arrow->attacktype \|= bow->attacktype;
1715		1673
1716	if (bow->slaying)	1674	if (bow->slaying)
1717	arrow->slaying = bow->slaying;	1675	arrow->slaying = bow->slaying;
1718		1676
1719	arrow->map = m;
1720	arrow->move_type = MOVE_FLY_LOW;	1677	arrow->move_type = MOVE_FLY_LOW;
1721	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;	1678	arrow->move_on = MOVE_FLY_LOW \| MOVE_WALK;
1722		1679
1723	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);	1680	play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1724	insert_ob_in_map (arrow, m, op, 0);	1681	m->insert (arrow, sx, sy, op);
1725		1682
1726	if (!arrow->destroyed ())	1683	if (!arrow->destroyed ())
1727	move_arrow (arrow);	1684	move_arrow (arrow);
1728		1685
1729	if (op->type == PLAYER)	1686	if (op->type == PLAYER)
…		…
1755	}	1712	}
1756	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)	1713	else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1757	{	1714	{
1758	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))	1715	if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1759	wcmod = -1;	1716	wcmod = -1;
		1717
1760	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);	1718	ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1761	}	1719	}
1762	else if (op->contr->bowtype == bow_threewide)	1720	else if (op->contr->bowtype == bow_threewide)
1763	{	1721	{
1764	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);	1722	ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
…		…
1834		1792
1835	if (item->arch)	1793	if (item->arch)
1836	{	1794	{
1837	CLEAR_FLAG (item, FLAG_ANIMATE);	1795	CLEAR_FLAG (item, FLAG_ANIMATE);
1838	item->face = item->arch->clone.face;	1796	item->face = item->arch->clone.face;
1839	item->speed = 0;	1797	item->set_speed (0);
1840	update_ob_speed (item);
1841	}	1798	}
		1799
1842	if ((tmp = item->in_player ()))	1800	if ((tmp = item->in_player ()))
1843	esrv_update_item (UPD_ANIM, tmp, item);	1801	esrv_update_item (UPD_ANIM, tmp, item);
1844	}	1802	}
1845	}	1803	}
1846	else if (item->type == ROD \|\| item->type == HORN)	1804	else if (item->type == ROD \|\| item->type == HORN)
1847	{
1848	drain_rod_charge (item);	1805	drain_rod_charge (item);
1849	}
1850	}	1806	}
1851	}	1807	}
1852		1808
1853	/* Received a fire command for the player - go and do it.	1809	/* Received a fire command for the player - go and do it.
1854	*/	1810	*/
…		…
1893	{	1849	{
1894	if (op->type == PLAYER)	1850	if (op->type == PLAYER)
1895	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");	1851	new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1896	return;	1852	return;
1897	}	1853	}
		1854
1898	(void) do_skill (op, op, op->chosen_skill, dir, NULL);	1855	do_skill (op, op, op->chosen_skill, dir, NULL);
1899	return;	1856	return;
1900	case range_builder:	1857	case range_builder:
1901	apply_map_builder (op, dir);	1858	apply_map_builder (op, dir);
1902	return;	1859	return;
1903	default:	1860	default:
…		…
2070	*/	2027	*/
2071	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))	2028	if ((op->contr->braced \|\| !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2072	{	2029	{
2073	if (OUT_OF_REAL_MAP (op->map, nx, ny))	2030	if (OUT_OF_REAL_MAP (op->map, nx, ny))
2074	{	2031	{
2075	m = get_map_from_coord (op->map, &nx, &ny);	2032	m = op->map->xy_find (nx, ny);
2076	if (!m)	2033	if (!m)
2077	return; /* Don't think this should happen */	2034	return; /* Don't think this should happen */
2078	}	2035	}
2079	else	2036	else
2080	m = op->map;	2037	m = op->map;
2081		2038
2082	if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)	2039	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;	2040	return;
2086	}
2087		2041
2088	mon = 0;	2042	mon = 0;
2089	/* Go through all the objects, and find ones of interest. Only stop if	2043	/* 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.	2044	* 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	2045	* 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)))	2098	&& (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) \|\| QUERY_FLAG (mon, FLAG_FRIENDLY)))
2145	{	2099	{
2146	/* If we're braced, we don't want to switch places with it */	2100	/* If we're braced, we don't want to switch places with it */
2147	if (op->contr->braced)	2101	if (op->contr->braced)
2148	return;	2102	return;
		2103
2149	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2104	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2150	(void) push_ob (mon, dir, op);	2105	(void) push_ob (mon, dir, op);
2151	if (op->contr->tmp_invis \|\| op->hide)	2106	if (op->contr->tmp_invis \|\| op->hide)
2152	make_visible (op);	2107	make_visible (op);
		2108
2153	return;	2109	return;
2154	}	2110	}
2155		2111
2156	/* in certain circumstances, you shouldn't attack friendly	2112	/* in certain circumstances, you shouldn't attack friendly
2157	* creatures. Note that if you are braced, you can't push	2113	* creatures. Note that if you are braced, you can't push
…		…
2171	!on_battleground))	2127	!on_battleground))
2172	{	2128	{
2173	if (!op->contr->braced)	2129	if (!op->contr->braced)
2174	{	2130	{
2175	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);	2131	play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2176	(void) push_ob (mon, dir, op);	2132	push_ob (mon, dir, op);
2177	}	2133	}
2178	else	2134	else
2179	new_draw_info (0, 0, op, "You withhold your attack");	2135	new_draw_info (0, 0, op, "You withhold your attack");
2180		2136
2181	if (op->contr->tmp_invis \|\| op->hide)	2137	if (op->contr->tmp_invis \|\| op->hide)
…		…
2196	* Way it works is like this: First, it must have some hit points	2152	* 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:	2153	* 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	2154	* 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.	2155	* that party_number -1 is no party, so attacks can still happen.
2200	*/	2156	*/
2201
2202	else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&	2157	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)))	2158	((mon->type != PLAYER \|\| op->contr->party == NULL \|\| op->contr->party != mon->contr->party)))
2204	{	2159	{
2205		2160
2206	/* If the player hasn't hit something this tick, and does	2161	/* If the player hasn't hit something this tick, and does
…		…
2240	int	2195	int
2241	move_player (object *op, int dir)	2196	move_player (object *op, int dir)
2242	{	2197	{
2243	int pick;	2198	int pick;
2244		2199
2245	if (op->map == NULL \|\| op->map->in_memory != MAP_IN_MEMORY)	2200	if (!op->map \|\| op->map->in_memory != MAP_IN_MEMORY)
2246	return 0;	2201	return 0;
2247		2202
2248	/* Sanity check: make sure dir is valid */	2203	/* Sanity check: make sure dir is valid */
2249	if ((dir < 0) \|\| (dir >= 9))	2204	if ((dir < 0) \|\| (dir >= 9))
2250	{	2205	{
2251	LOG (llevError, "move_player: invalid direction %d\n", dir);	2206	LOG (llevError, "move_player: invalid direction %d\n", dir);
2252	return 0;	2207	return 0;
2253	}	2208	}
2254		2209
2255	/* peterm: added following line */	2210	/* peterm: added following line */
2256	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)	2211	if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2257	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);	2212	dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2258		2213
2259	op->facing = dir;	2214	op->facing = dir;
2260		2215
…		…
2338		2293
2339	/* call this here - we also will call this in do_ericserver, but	2294	/* call this here - we also will call this in do_ericserver, but
2340	* the players time has been increased when doericserver has been	2295	* the players time has been increased when doericserver has been
2341	* called, so we recheck it here.	2296	* called, so we recheck it here.
2342	*/	2297	*/
2343	//TODO: better than handling 8 commands, use some more intelligent rate-limiting	2298	if (op->contr->ns->handle_command ())
2344	for (int rep = 8; --rep && op->contr->ns->handle_command (); )	2299	return 1;
2345	;
2346		2300
2347	if (op->speed_left < 0)	2301	if (op->speed_left > 0)
2348	return 0;	2302	{
2349
2350	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))	2303	if (op->direction && (op->contr->run_on \|\| op->contr->fire_on))
2351	{	2304	{
2352	/* All move commands take 1 tick, at least for now */	2305	/* All move commands take 1 tick, at least for now */
2353	op->speed_left--;	2306	op->speed_left--;
2354		2307
2355	/* Instead of all the stuff below, let move_player take care	2308	/* Instead of all the stuff below, let move_player take care
2356	* of it. Also, some of the skill stuff is only put in	2309	* of it. Also, some of the skill stuff is only put in
2357	* there, as well as the confusion stuff.	2310	* there, as well as the confusion stuff.
2358	*/	2311	*/
2359	move_player (op, op->direction);	2312	move_player (op, op->direction);
2360	if (op->speed_left > 0)	2313
2361	return 1;	2314	return op->speed_left > 0;
2362	else	2315	}
2363	return 0;
2364	}	2316	}
2365		2317
2366	return 0;	2318	return 0;
2367	}	2319	}
2368		2320
…		…
2410	{	2362	{
2411	object *next;	2363	object *next;
2412		2364
2413	while (op)	2365	while (op)
2414	{	2366	{
2415	next = op->below; /* Make sure we have a good value, in case	2367	object next = op->below; / Make sure we have a good value, in case we remove object 'op' */
2416	* we remove object 'op'	2368
2417	*/
2418	if (QUERY_FLAG (op, FLAG_UNPAID))	2369	if (QUERY_FLAG (op, FLAG_UNPAID))
2419	{	2370	{
2420	op->remove ();
2421	op->x = env->x;
2422	op->y = env->y;
2423	if (env->type == PLAYER)	2371	if (env->type == PLAYER)
2424	esrv_del_item (env->contr, op->count);	2372	esrv_del_item (env->contr, op->count);
2425	insert_ob_in_map (op, env->map, NULL, 0);	2373
		2374	op->insert_at (env);
2426	}	2375	}
2427	else if (op->inv)	2376	else if (op->inv)
2428	remove_unpaid_objects (op->inv, env);	2377	remove_unpaid_objects (op->inv, env);
2429		2378
2430	op = next;	2379	op = next;
…		…
2723	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "You have been defeated in combat!");	2672	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...");	2673	new_draw_info (NDI_UNIQUE \| NDI_NAVY, 0, op, "Local medics have saved your life...");
2725		2674
2726	/* restore player */	2675	/* restore player */
2727	at = archetype::find ("poisoning");	2676	at = archetype::find ("poisoning");
2728	tmp = present_arch_in_ob (at, op);	2677	if (object *tmp = present_arch_in_ob (at, op))
2729	if (tmp)
2730	{	2678	{
2731	tmp->destroy ();	2679	tmp->destroy ();
2732	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");	2680	new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2733	}	2681	}
2734		2682
2735	at = archetype::find ("confusion");	2683	at = archetype::find ("confusion");
2736	tmp = present_arch_in_ob (at, op);	2684	if (object *tmp = present_arch_in_ob (at, op))
2737	if (tmp)
2738	{	2685	{
2739	tmp->destroy ();	2686	tmp->destroy ();
2740	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");	2687	new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2741	}	2688	}
2742		2689
…		…
2744	op->stats.hp = op->stats.maxhp;	2691	op->stats.hp = op->stats.maxhp;
2745	if (op->stats.food <= 0)	2692	if (op->stats.food <= 0)
2746	op->stats.food = 999;	2693	op->stats.food = 999;
2747		2694
2748	/* create a bodypart-trophy to make the winner happy */	2695	/* create a bodypart-trophy to make the winner happy */
2749	tmp = arch_to_object (archetype::find ("finger"));	2696	if (object *tmp = arch_to_object (archetype::find ("finger")))
2750	if (tmp != NULL)
2751	{	2697	{
2752	sprintf (buf, "%s's finger", &op->name);	2698	sprintf (buf, "%s's finger", &op->name);
2753	tmp->name = buf;	2699	tmp->name = buf;
2754	sprintf (buf, " This finger has been cut off %s\n"	2700	sprintf (buf, " This finger has been cut off %s\n"
2755	" the %s, when he was defeated at\n level %d by %s.\n",	2701	" 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);	2702	&op->name, op->contr->title, (int) (op->level), op->contr->killer);
2757	tmp->msg = buf;	2703	tmp->msg = buf;
2758	tmp->value = 0, tmp->material = 0, tmp->type = 0;	2704	tmp->value = 0, tmp->material = 0, tmp->type = 0;
2759	tmp->materialname = NULL;	2705	tmp->materialname = NULL;
2760	tmp->x = op->x, tmp->y = op->y;	2706	tmp->insert_at (op, tmp);
2761	insert_ob_in_map (tmp, op->map, op, 0);
2762	}	2707	}
2763		2708
2764	/* teleport defeated player to new destination */	2709	/* teleport defeated player to new destination */
2765	transfer_ob (op, x, y, 0, NULL);	2710	transfer_ob (op, x, y, 0, NULL);
2766	op->contr->braced = 0;	2711	op->contr->braced = 0;
…		…
2771		2716
2772	command_kill_pets (op, 0);	2717	command_kill_pets (op, 0);
2773		2718
2774	if (op->stats.food < 0)	2719	if (op->stats.food < 0)
2775	{	2720	{
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);	2721	sprintf (buf, "%s starved to death.", &op->name);
2784	strcpy (op->contr->killer, "starvation");	2722	strcpy (op->contr->killer, "starvation");
2785	}	2723	}
2786	else	2724	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);	2725	sprintf (buf, "%s died.", &op->name);
2796	}	2726
2797	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);	2727	play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2798		2728
2799	/* save the map location for corpse, gravestone */	2729	/* save the map location for corpse, gravestone */
2800	x = op->x;	2730	x = op->x;
2801	y = op->y;	2731	y = op->y;
2802	map = op->map;	2732	map = op->map;
2803
2804		2733
2805	/* NOT_PERMADEATH code. This basically brings the character back to	2734	/* NOT_PERMADEATH code. This basically brings the character back to
2806	* life if they are dead - it takes some exp and a random stat.	2735	* 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.	2736	* See the config.h file for a little more in depth detail about this.
2808	*/	2737	*/
…		…
2825	num_stats_lose = 1;	2754	num_stats_lose = 1;
2826	else	2755	else
2827	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;	2756	num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2828	}	2757	}
2829	else	2758	else
2830	{
2831	num_stats_lose = 1;	2759	num_stats_lose = 1;
2832	}	2760
2833	lost_a_stat = 0;	2761	lost_a_stat = 0;
2834		2762
2835	for (z = 0; z < num_stats_lose; z++)	2763	for (z = 0; z < num_stats_lose; z++)
2836	{	2764	{
2837	i = RANDOM () % NUM_STATS;	2765	i = RANDOM () % NUM_STATS;
…		…
2995	/* */	2923	/* */
2996	/****************************************/	2924	/****************************************/
2997		2925
2998	enter_player_savebed (op);	2926	enter_player_savebed (op);
2999		2927
3000	/* Save the player before inserting the force to reduce
3001	* chance of abuse.
3002	*/
3003	op->contr->braced = 0;	2928	op->contr->braced = 0;
3004	op->contr->save ();
3005		2929
3006	/* it is possible that the player has blown something up	2930	/* it is possible that the player has blown something up
3007	* at his savebed location, and that can have long lasting	2931	* at his savebed location, and that can have long lasting
3008	* spell effects. So first see if there is a spell effect	2932	* spell effects. So first see if there is a spell effect
3009	* on the space that might harm the player.	2933	* on the space that might harm the player.
…		…
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	}

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.64 by root, Tue Dec 26 03:35:59 2006 UTC vs. Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.64 by root, Tue Dec 26 03:35:59 2006 UTC vs.
Revision 1.96 by root, Mon Jan 8 19:25:53 2007 UTC