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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
4	Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5	Copyright (C) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
7		7	*
8	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
9	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
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	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,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	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
19	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		21	*
22	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>
23	*/	23	*/
24		24
25	/**	25	/**
26	* \file	26	* \file
27	* Client handling.	27	* Client handling.
28	*	28	*
147	pl->ns->send_packet ("newmap");	147	pl->ns->send_packet ("newmap");
148		148
149	pl->ns->floorbox_reset ();	149	pl->ns->floorbox_reset ();
150	}	150	}
151		151
152	/** check for map change and send new map data */	152	/** check for map/region change and send new map data */
153	static void	153	static void
154	check_map_change (player *pl)	154	check_map_change (player *pl)
155	{	155	{
156	client &socket = *pl->ns;	156	client &socket = *pl->ns;
157	object *ob = pl->ob;	157	object *ob = pl->ob;
…		…
201	}	201	}
202	}	202	}
203		203
204	socket.current_x = ob->x;	204	socket.current_x = ob->x;
205	socket.current_y = ob->y;	205	socket.current_y = ob->y;
		206
		207	region *reg = ob->region ();
		208	if (socket.current_region != reg)
		209	{
		210	socket.current_region = reg;
		211	socket.send_packet_printf ("drawinfo 0 You are now %s.\n(use whereami for more details)", &reg->longname);
		212	}
206	}	213	}
207		214
208	/**	215	/**
209	* RequestInfo is sort of a meta command. There is some specific	216	* RequestInfo is sort of a meta command. There is some specific
210	* request of information, but we call other functions to provide	217	* request of information, but we call other functions to provide
…		…
798	* commands.	805	* commands.
799	*/	806	*/
800	pl->count = 0;	807	pl->count = 0;
801		808
802	//TODO: schmorp thinks whatever this calculates, it makes no sense at all	809	//TODO: schmorp thinks whatever this calculates, it makes no sense at all
803	int time = FABS (pl->ob->speed) < 0.001	810	int time = fabs (pl->ob->speed) < 0.001
804	? time = MAX_TIME * 100	811	? time = MAX_TIME * 100
805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	812	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
806		813
807	/* Send confirmation of command execution now */	814	/* Send confirmation of command execution now */
808	packet sl ("comc");	815	packet sl ("comc");
809	sl << uint16 (cmdid) << uint32 (time);	816	sl << uint16 (cmdid) << uint32 (time);
810	pl->ns->send_packet (sl);	817	pl->ns->send_packet (sl);
…		…
1007	esrv_update_stats (player *pl)	1014	esrv_update_stats (player *pl)
1008	{	1015	{
1009	char buf[MAX_BUF];	1016	char buf[MAX_BUF];
1010	uint16 flags;	1017	uint16 flags;
1011		1018
		1019	client *ns = pl->ns;
1012	if (!pl->ns)	1020	if (!ns)
1013	return;	1021	return;
1014		1022
		1023	object *ob = pl->ob;
		1024	if (!ob)
		1025	return;
		1026
1015	packet sl ("stats");	1027	packet sl ("stats");
1016		1028
1017	if (pl->ob)
1018	{
1019	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1029	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1020	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1030	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1021	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1031	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1022	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1032	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1023	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1033	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1024	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1034	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1025	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1035	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1026	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1036	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1027	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1037	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1028	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	1038	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1029	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	1039	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1030	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	1040	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1031	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1041	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1032	}
1033		1042
1034	for (int s = 0; s < NUM_SKILLS; s++)	1043	for (int s = 0; s < NUM_SKILLS; s++)
1035	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1044	if (object *skill = pl->last_skill_ob[s])
		1045	if (skill->stats.exp != ns->last_skill_exp [s])
1036	{	1046	{
		1047	ns->last_skill_exp [s] = skill->stats.exp;
		1048
1037	/* Always send along the level if exp changes. This is only	1049	/* Always send along the level if exp changes. This is only
1038	* 1 extra byte, but keeps processing simpler.	1050	* 1 extra byte, but keeps processing simpler.
1039	*/	1051	*/
1040	sl << uint8 (s + CS_STAT_SKILLINFO)	1052	sl << uint8 (s + CS_STAT_SKILLINFO)
1041	<< uint8 (pl->last_skill_ob[s]->level)	1053	<< uint8 (skill->level)
1042	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1054	<< uint64 (skill->stats.exp);
1043
1044	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1045	}	1055	}
1046		1056
1047	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);	1057	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1048	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1058	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1049	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1059	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1050	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1060	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1051	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1061	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1052	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1062	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1053	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1063	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1054	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1064	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1055	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1065	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1066
1056	flags = 0;	1067	flags = 0;
1057		1068
1058	if (pl->fire_on)	1069	if (pl->fire_on)
1059	flags \|= SF_FIREON;	1070	flags \|= SF_FIREON;
1060		1071
1061	if (pl->run_on)	1072	if (pl->run_on)
1062	flags \|= SF_RUNON;	1073	flags \|= SF_RUNON;
1063		1074
1064	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1075	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1065		1076
1066	if (pl->ns->sc_version < 1025)	1077	if (ns->sc_version < 1025)
1067	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1078	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1068	else	1079	else
1069	for (int i = 0; i < NROFATTACKS; i++)	1080	for (int i = 0; i < NROFATTACKS; i++)
1070	{	1081	{
1071	/* Skip ones we won't send */	1082	/* Skip ones we won't send */
1072	if (atnr_cs_stat[i] == -1)	1083	if (atnr_cs_stat[i] == -1)
1073	continue;	1084	continue;
1074		1085
1075	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1086	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1076	}	1087	}
1077		1088
1078	if (pl->ns->monitor_spells)	1089	if (pl->ns->monitor_spells)
1079	{	1090	{
1080	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1091	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1081	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1092	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1082	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1093	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1083	}	1094	}
1084		1095
1085	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1096	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1086	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	1097	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1087	set_title (pl->ob, buf);	1098	set_title (ob, buf);
1088	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	1099	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1089		1100
1090	/* Only send it away if we have some actual data */	1101	/* Only send it away if we have some actual data */
1091	if (sl.length () > 6)	1102	if (sl.length () > 6)
1092	pl->ns->send_packet (sl);	1103	ns->send_packet (sl);
1093	}	1104	}
1094		1105
1095	/**	1106	/**
1096	* Tells the client that here is a player it should start using.	1107	* Tells the client that here is a player it should start using.
1097	*/	1108	*/
1098	void	1109	void
1099	esrv_new_player (player *pl, uint32 weight)	1110	esrv_new_player (player *pl, uint32 weight)
1100	{	1111	{
1101	pl->last_weight = weight;
1102
1103	packet sl ("player");	1112	packet sl ("player");
1104		1113
1105	sl << uint32 (pl->ob->count)	1114	sl << uint32 (pl->ob->count)
1106	<< uint32 (weight)	1115	<< uint32 (weight)
1107	<< uint32 (pl->ob->face->number)	1116	<< uint32 (pl->ob->face->number)
1108	<< data8 (pl->ob->name);	1117	<< data8 (pl->ob->name);
1109		1118
		1119	pl->ns->last_weight = weight;
1110	pl->ns->send_packet (sl);	1120	pl->ns->send_packet (sl);
1111	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1121	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1112	}	1122	}
1113		1123
1114	/**	1124	/**
…		…
1549	}	1559	}
1550		1560
1551	return result;	1561	return result;
1552	}	1562	}
1553		1563
		1564	// prefetch (and touch) all maps within a specific distancd
		1565	static void
		1566	prefetch_surrounding_maps (maptile *map, int distance)
		1567	{
		1568	map->last_access = runtime;
		1569
		1570	if (--distance)
		1571	for (int dir = 4; --dir; )
		1572	if (const shstr &path = map->tile_path [dir])
		1573	if (maptile *&neigh = map->tile_map [dir])
		1574	prefetch_surrounding_maps (neigh, distance);
		1575	else
		1576	neigh = maptile::find_async (path, map);
		1577	}
		1578
		1579	// prefetch a generous area around the player
		1580	static void
		1581	prefetch_surrounding_maps (object *op)
		1582	{
		1583	prefetch_surrounding_maps (op->map, 3);
		1584	}
		1585
1554	/**	1586	/**
1555	* This function uses the new map1 protocol command to send the map	1587	* This function uses the new map1 protocol command to send the map
1556	* to the client. It is necessary because the old map command supports	1588	* to the client. It is necessary because the old map command supports
1557	* a maximum map size of 15x15.	1589	* a maximum map size of 15x15.
1558	* This function is much simpler than the old one. This is because	1590	* This function is much simpler than the old one. This is because
…		…
1589		1621
1590	if (!pl->active)	1622	if (!pl->active)
1591	return;	1623	return;
1592		1624
1593	check_map_change (pl->contr);	1625	check_map_change (pl->contr);
		1626	prefetch_surrounding_maps (pl);
1594		1627
1595	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1628	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1596	packet esl;	1629	packet esl;
1597		1630
1598	startlen = sl.length ();	1631	startlen = sl.length ();
…		…
1966	void	1999	void
1967	draw_client_map (object *pl)	2000	draw_client_map (object *pl)
1968	{	2001	{
1969	int i, j;	2002	int i, j;
1970	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	2003	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1971	New_Face face, floor;	2004	facetile face, floor;
1972	New_Face *floor2;	2005	facetile *floor2;
1973	int d, mflags;	2006	int d, mflags;
1974	struct Map newmap;	2007	struct Map newmap;
1975	maptile m, pm;	2008	maptile m, pm;
1976		2009
1977	if (pl->type != PLAYER)	2010	if (pl->type != PLAYER)

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.60 by root, Sun Jan 7 02:39:15 2007 UTC vs. Revision 1.66 by root, Thu Feb 15 04:04:23 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.60 by root, Sun Jan 7 02:39:15 2007 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 2007 UTC