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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.56 by root, Mon Jan 1 12:28:47 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) 2001 Mark Wedel	5	* Copyright (C) 2001 Mark Wedel
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	/**	25	/**
25	* \file	26	* \file
26	* Client handling.	27	* Client handling.
27	*	28	*
146	pl->ns->send_packet ("newmap");	147	pl->ns->send_packet ("newmap");
147		148
148	pl->ns->floorbox_reset ();	149	pl->ns->floorbox_reset ();
149	}	150	}
150		151
151	/** check for map change and send new map data */	152	/** check for map/region change and send new map data */
152	static void	153	static void
153	check_map_change (player *pl)	154	check_map_change (player *pl)
154	{	155	{
155	client &socket = *pl->ns;	156	client &socket = *pl->ns;
156	object *ob = pl->ob;	157	object *ob = pl->ob;
…		…
200	}	201	}
201	}	202	}
202		203
203	socket.current_x = ob->x;	204	socket.current_x = ob->x;
204	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	}
205	}	213	}
206		214
207	/**	215	/**
208	* RequestInfo is sort of a meta command. There is some specific	216	* RequestInfo is sort of a meta command. There is some specific
209	* request of information, but we call other functions to provide	217	* request of information, but we call other functions to provide
…		…
290	{	298	{
291	int dir = *buf++;	299	int dir = *buf++;
292		300
293	switch (dir)	301	switch (dir)
294	{	302	{
295	case '1':	303	case '1':
296	dx = 0;	304	dx = 0;
297	dy = -1;	305	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	306	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	307	map && (mapy -= map->height);
300	break;	308	break;
301	case '2':	309	case '2':
302	mapx += map->width;	310	mapx += map->width;
303	dx = map->width;	311	dx = map->width;
304	dy = 0;	312	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	313	map = map->xy_find (dx, dy);
306	break;	314	break;
307	case '3':	315	case '3':
308	mapy += map->height;	316	mapy += map->height;
309	dx = 0;	317	dx = 0;
310	dy = map->height;	318	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	319	map = map->xy_find (dx, dy);
312	break;	320	break;
313	case '4':	321	case '4':
314	dx = -1;	322	dx = -1;
315	dy = 0;	323	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	324	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	325	map && (mapx -= map->width);
318	break;	326	break;
319	}	327	}
320		328
321	--max_distance;	329	--max_distance;
322	}	330	}
323		331
…		…
797	* commands.	805	* commands.
798	*/	806	*/
799	pl->count = 0;	807	pl->count = 0;
800		808
801	//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
802	int time = FABS (pl->ob->speed) < 0.001	810	int time = fabs (pl->ob->speed) < 0.001
803	? time = MAX_TIME * 100	811	? time = MAX_TIME * 100
804	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	812	: time = (int) (MAX_TIME / fabs (pl->ob->speed));
805		813
806	/* Send confirmation of command execution now */	814	/* Send confirmation of command execution now */
807	packet sl ("comc");	815	packet sl ("comc");
808	sl << uint16 (cmdid) << uint32 (time);	816	sl << uint16 (cmdid) << uint32 (time);
809	pl->ns->send_packet (sl);	817	pl->ns->send_packet (sl);
…		…
845		853
846	case ST_CHANGE_CLASS:	854	case ST_CHANGE_CLASS:
847	key_change_class (pl->ob, buf[0]);	855	key_change_class (pl->ob, buf[0]);
848	break;	856	break;
849		857
850	case ST_CONFIRM_QUIT:
851	key_confirm_quit (pl->ob, buf[0]);
852	break;
853
854	case ST_GET_PARTY_PASSWORD: /* Get password for party */	858	case ST_GET_PARTY_PASSWORD: /* Get password for party */
855	receive_party_password (pl->ob, 13);	859	receive_party_password (pl->ob, 13);
856	break;	860	break;
857		861
858	default:	862	default:
…		…
914	{	918	{
915	ns->sound = atoi (buf);	919	ns->sound = atoi (buf);
916	}	920	}
917		921
918	/** client wants the map resent */	922	/** client wants the map resent */
919
920	void	923	void
921	MapRedrawCmd (char buf, int len, player pl)	924	MapRedrawCmd (char buf, int len, player pl)
922	{	925	{
923	/* This function is currently disabled; just clearing the map state results in	926	/* This function is currently disabled; just clearing the map state results in
924	* display errors. It should clear the cache and send a newmap command.	927	* display errors. It should clear the cache and send a newmap command.
…		…
1011	esrv_update_stats (player *pl)	1014	esrv_update_stats (player *pl)
1012	{	1015	{
1013	char buf[MAX_BUF];	1016	char buf[MAX_BUF];
1014	uint16 flags;	1017	uint16 flags;
1015		1018
		1019	client *ns = pl->ns;
1016	if (!pl->ns)	1020	if (!ns)
1017	return;	1021	return;
1018		1022
		1023	object *ob = pl->ob;
		1024	if (!ob)
		1025	return;
		1026
1019	packet sl ("stats");	1027	packet sl ("stats");
1020		1028
1021	if (pl->ob)
1022	{
1023	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1029	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1024	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1030	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1025	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1031	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1026	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1032	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1027	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1033	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1028	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1034	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1029	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1035	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1030	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1036	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1031	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1037	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
1032	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);	1038	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
1033	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);	1039	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
1034	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);	1040	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1035	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1041	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1036	}
1037		1042
1038	for (int s = 0; s < NUM_SKILLS; s++)	1043	for (int s = 0; s < NUM_SKILLS; s++)
1039	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])
1040	{	1046	{
		1047	ns->last_skill_exp [s] = skill->stats.exp;
		1048
1041	/* Always send along the level if exp changes. This is only	1049	/* Always send along the level if exp changes. This is only
1042	* 1 extra byte, but keeps processing simpler.	1050	* 1 extra byte, but keeps processing simpler.
1043	*/	1051	*/
1044	sl << uint8 (s + CS_STAT_SKILLINFO)	1052	sl << uint8 (s + CS_STAT_SKILLINFO)
1045	<< uint8 (pl->last_skill_ob[s]->level)	1053	<< uint8 (skill->level)
1046	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1054	<< uint64 (skill->stats.exp);
1047
1048	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1049	}	1055	}
1050		1056
1051	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);	1057	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1052	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1058	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1053	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1059	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1054	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1060	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1055	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1061	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1056	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1062	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1057	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1063	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1058	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);
1059	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
1060	flags = 0;	1067	flags = 0;
1061		1068
1062	if (pl->fire_on)	1069	if (pl->fire_on)
1063	flags \|= SF_FIREON;	1070	flags \|= SF_FIREON;
1064		1071
1065	if (pl->run_on)	1072	if (pl->run_on)
1066	flags \|= SF_RUNON;	1073	flags \|= SF_RUNON;
1067		1074
1068	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1075	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1069		1076
1070	if (pl->ns->sc_version < 1025)	1077	if (ns->sc_version < 1025)
1071	{ 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) }
1072	else	1079	else
1073	for (int i = 0; i < NROFATTACKS; i++)	1080	for (int i = 0; i < NROFATTACKS; i++)
1074	{	1081	{
1075	/* Skip ones we won't send */	1082	/* Skip ones we won't send */
1076	if (atnr_cs_stat[i] == -1)	1083	if (atnr_cs_stat[i] == -1)
1077	continue;	1084	continue;
1078		1085
1079	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]);
1080	}	1087	}
1081		1088
1082	if (pl->ns->monitor_spells)	1089	if (pl->ns->monitor_spells)
1083	{	1090	{
1084	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);
1085	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);
1086	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);
1087	}	1094	}
1088		1095
1089	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 */
1090	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);	1097	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1091	set_title (pl->ob, buf);	1098	set_title (ob, buf);
1092	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);	1099	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1093		1100
1094	/* Only send it away if we have some actual data */	1101	/* Only send it away if we have some actual data */
1095	if (sl.length () > 6)	1102	if (sl.length () > 6)
1096	pl->ns->send_packet (sl);	1103	ns->send_packet (sl);
1097	}	1104	}
1098		1105
1099	/**	1106	/**
1100	* 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.
1101	*/	1108	*/
1102	void	1109	void
1103	esrv_new_player (player *pl, uint32 weight)	1110	esrv_new_player (player *pl, uint32 weight)
1104	{	1111	{
1105	pl->last_weight = weight;
1106
1107	packet sl ("player");	1112	packet sl ("player");
1108		1113
1109	sl << uint32 (pl->ob->count)	1114	sl << uint32 (pl->ob->count)
1110	<< uint32 (weight)	1115	<< uint32 (weight)
1111	<< uint32 (pl->ob->face->number)	1116	<< uint32 (pl->ob->face->number)
1112	<< data8 (pl->ob->name);	1117	<< data8 (pl->ob->name);
1113		1118
		1119	pl->ns->last_weight = weight;
1114	pl->ns->send_packet (sl);	1120	pl->ns->send_packet (sl);
1115	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1121	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1116	}	1122	}
1117		1123
1118	/**	1124	/**
…		…
1553	}	1559	}
1554		1560
1555	return result;	1561	return result;
1556	}	1562	}
1557		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
1558	/**	1586	/**
1559	* 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
1560	* 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
1561	* a maximum map size of 15x15.	1589	* a maximum map size of 15x15.
1562	* 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	uint8 extendedinfos;	1617	uint8 extendedinfos;
1590	maptile *m;	1618	maptile *m;
1591		1619
1592	client &socket = *pl->contr->ns;	1620	client &socket = *pl->contr->ns;
1593		1621
		1622	if (!pl->active)
		1623	return;
		1624
1594	check_map_change (pl->contr);	1625	check_map_change (pl->contr);
		1626	prefetch_surrounding_maps (pl);
1595		1627
1596	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1628	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1597	packet esl;	1629	packet esl;
1598		1630
1599	startlen = sl.length ();	1631	startlen = sl.length ();
…		…
1967	void	1999	void
1968	draw_client_map (object *pl)	2000	draw_client_map (object *pl)
1969	{	2001	{
1970	int i, j;	2002	int i, j;
1971	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 */
1972	New_Face face, floor;	2004	facetile face, floor;
1973	New_Face *floor2;	2005	facetile *floor2;
1974	int d, mflags;	2006	int d, mflags;
1975	struct Map newmap;	2007	struct Map newmap;
1976	maptile m, pm;	2008	maptile m, pm;
1977		2009
1978	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.56 by root, Mon Jan 1 12:28:47 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.56 by root, Mon Jan 1 12:28:47 2007 UTC vs.
Revision 1.66 by root, Thu Feb 15 04:04:23 2007 UTC