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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.64 by pippijn, Sat Jan 20 13:47:17 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	*
138	}	139	}
139		140
140	static void	141	static void
141	clear_map (player *pl)	142	clear_map (player *pl)
142	{	143	{
143	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));	144	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		145
145	if (pl->socket->newmapcmd == 1)	146	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	147	pl->ns->send_packet ("newmap");
147		148
148	pl->socket->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 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->socket;	156	client &socket = *pl->ns;
156	object *ob = pl->ob;	157	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	158	char buf[MAX_BUF]; /* eauugggh */
158		159
159	if (socket.current_map != ob->map)	160	if (socket.current_map != ob->map)
160	{	161	{
…		…
176	flags \|= 4;	177	flags \|= 4;
177	if (ob->map->tile_path[3])	178	if (ob->map->tile_path[3])
178	flags \|= 8;	179	flags \|= 8;
179		180
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	181	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);	182	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	183	}
183	else	184	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	185	snprintf (buf, MAX_BUF, "mapinfo current");
185		186
186	socket.send_packet (buf);	187	socket.send_packet (buf);
…		…
280	buf += 8;	281	buf += 8;
281		282
282	// initial map and its origin	283	// initial map and its origin
283	maptile *map = pl->ob->map;	284	maptile *map = pl->ob->map;
284	sint16 dx, dy;	285	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	286	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	287	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	288	int max_distance = 8; // limit maximum path length to something generous
288		289
289	while (*buf && map && max_distance)	290	while (*buf && map && max_distance)
290	{	291	{
291	int dir = *buf++;	292	int dir = *buf++;
292		293
293	switch (dir)	294	switch (dir)
294	{	295	{
295	case '1':	296	case '1':
296	dx = 0;	297	dx = 0;
297	dy = -1;	298	dy = -1;
298	map = get_map_from_coord (map, &dx, &dy);	299	map = map->xy_find (dx, dy);
299	map && (mapy -= map->height);	300	map && (mapy -= map->height);
300	break;	301	break;
301	case '2':	302	case '2':
302	mapx += map->width;	303	mapx += map->width;
303	dx = map->width;	304	dx = map->width;
304	dy = 0;	305	dy = 0;
305	map = get_map_from_coord (map, &dx, &dy);	306	map = map->xy_find (dx, dy);
306	break;	307	break;
307	case '3':	308	case '3':
308	mapy += map->height;	309	mapy += map->height;
309	dx = 0;	310	dx = 0;
310	dy = map->height;	311	dy = map->height;
311	map = get_map_from_coord (map, &dx, &dy);	312	map = map->xy_find (dx, dy);
312	break;	313	break;
313	case '4':	314	case '4':
314	dx = -1;	315	dx = -1;
315	dy = 0;	316	dy = 0;
316	map = get_map_from_coord (map, &dx, &dy);	317	map = map->xy_find (dx, dy);
317	map && (mapx -= map->width);	318	map && (mapx -= map->width);
318	break;	319	break;
319	}	320	}
320		321
321	--max_distance;	322	--max_distance;
322	}	323	}
323		324
…		…
334	if (map->tile_path[2])	335	if (map->tile_path[2])
335	flags \|= 4;	336	flags \|= 4;
336	if (map->tile_path[3])	337	if (map->tile_path[3])
337	flags \|= 8;	338	flags \|= 8;
338		339
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	340	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
340	}	341	}
341	else	342	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	343	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	344	}
344	else	345	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	346	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		347
347	pl->socket->send_packet (bigbuf);	348	pl->ns->send_packet (bigbuf);
348	}	349	}
349		350
350	/** This is the Setup cmd - easy first implementation */	351	/** This is the Setup cmd - easy first implementation */
351	void	352	void
352	SetUp (char buf, int len, client ns)	353	SetUp (char buf, int len, client ns)
…		…
399	{	400	{
400	ns->sound = atoi (param);	401	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);	402	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}	403	}
403	else if (!strcmp (cmd, "exp64"))	404	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);	405	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))	406	else if (!strcmp (cmd, "spellmon"))
409	{	407	{
410	ns->monitor_spells = atoi (param);	408	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);	409	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}	410	}
…		…
569	* it either has to be here or init_sockets needs to be exported.	567	* it either has to be here or init_sockets needs to be exported.
570	*/	568	*/
571	void	569	void
572	AddMeCmd (char buf, int len, client ns)	570	AddMeCmd (char buf, int len, client ns)
573	{	571	{
574	if (ns->status != Ns_Add \|\| add_player (ns))	572	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	ns->send_packet ("addme_failed");
576	else
577	ns->send_packet ("addme_success");
578	}	573	}
579		574
580	/** Reply to ExtendedInfos command */	575	/** Reply to ExtendedInfos command */
581	void	576	void
582	ToggleExtendedInfos (char buf, int len, client ns)	577	ToggleExtendedInfos (char buf, int len, client ns)
…		…
810	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	805	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
811		806
812	/* Send confirmation of command execution now */	807	/* Send confirmation of command execution now */
813	packet sl ("comc");	808	packet sl ("comc");
814	sl << uint16 (cmdid) << uint32 (time);	809	sl << uint16 (cmdid) << uint32 (time);
815	pl->socket->send_packet (sl);	810	pl->ns->send_packet (sl);
816	}	811	}
817
818		812
819	/** This is a reply to a previous query. */	813	/** This is a reply to a previous query. */
820	void	814	void
821	ReplyCmd (char buf, int len, player pl)	815	ReplyCmd (char buf, int len, client ns)
822	{	816	{
		817	if (ns->state == ST_CUSTOM)
		818	{
		819	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		820	return;
		821	}
		822
		823	if (!ns->pl)
		824	return; //TODO: depends on the exact reply we are after
		825	//TODO: but right now, we always have a ns->pl
		826
		827	player *pl = ns->pl;
		828
823	/* This is to synthesize how the data would be stored if it	829	/* This is to synthesize how the data would be stored if it
824	* was normally entered. A bit of a hack, and should be cleaned up	830	* was normally entered. A bit of a hack, and should be cleaned up
825	* once all the X11 code is removed from the server.	831	* once all the X11 code is removed from the server.
826	*	832	*
827	* We pass 13 to many of the functions because this way they	833	* We pass 13 to many of the functions because this way they
…		…
830	*/	836	*/
831	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	837	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
832		838
833	/* this avoids any hacking here */	839	/* this avoids any hacking here */
834		840
835	switch (pl->state)	841	switch (ns->state)
836	{	842	{
837	case ST_PLAYING:	843	case ST_PLAYING:
838	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	844	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
839	break;	845	break;
840		846
841	case ST_PLAY_AGAIN:
842	/* We can check this for return value (2==quit). Maybe we
843	* should, and do something appropriate?
844	*/
845	receive_play_again (pl->ob, buf[0]);
846	break;
847
848	case ST_ROLL_STAT:
849	key_roll_stat (pl->ob, buf[0]);
850	break;
851
852	case ST_CHANGE_CLASS:	847	case ST_CHANGE_CLASS:
853
854	key_change_class (pl->ob, buf[0]);	848	key_change_class (pl->ob, buf[0]);
855	break;
856
857	case ST_CONFIRM_QUIT:
858	key_confirm_quit (pl->ob, buf[0]);
859	break;
860
861	case ST_CONFIGURE:
862	LOG (llevError, "In client input handling, but into configure state\n");
863	pl->state = ST_PLAYING;
864	break;
865
866	case ST_GET_NAME:
867	receive_player_name (pl->ob, 13);
868	break;
869
870	case ST_GET_PASSWORD:
871	case ST_CONFIRM_PASSWORD:
872	receive_player_password (pl->ob, 13);
873	break;	849	break;
874		850
875	case ST_GET_PARTY_PASSWORD: /* Get password for party */	851	case ST_GET_PARTY_PASSWORD: /* Get password for party */
876	receive_party_password (pl->ob, 13);	852	receive_party_password (pl->ob, 13);
877	break;	853	break;
878		854
879	default:	855	default:
880	LOG (llevError, "Unknown input state: %d\n", pl->state);	856	LOG (llevError, "Unknown input state: %d\n", ns->state);
881	}	857	}
882	}	858	}
883		859
884	/**	860	/**
885	* Client tells its version. If there is a mismatch, we close the	861	* Client tells its version. If there is a mismatch, we close the
…		…
935	{	911	{
936	ns->sound = atoi (buf);	912	ns->sound = atoi (buf);
937	}	913	}
938		914
939	/** client wants the map resent */	915	/** client wants the map resent */
940
941	void	916	void
942	MapRedrawCmd (char buf, int len, player pl)	917	MapRedrawCmd (char buf, int len, player pl)
943	{	918	{
944	/* This function is currently disabled; just clearing the map state results in	919	/* This function is currently disabled; just clearing the map state results in
945	* display errors. It should clear the cache and send a newmap command.	920	* display errors. It should clear the cache and send a newmap command.
…		…
1032	esrv_update_stats (player *pl)	1007	esrv_update_stats (player *pl)
1033	{	1008	{
1034	char buf[MAX_BUF];	1009	char buf[MAX_BUF];
1035	uint16 flags;	1010	uint16 flags;
1036		1011
		1012	client *ns = pl->ns;
		1013	if (!ns)
		1014	return;
		1015
		1016	object *ob = pl->ob;
		1017	if (!ob)
		1018	return;
		1019
1037	packet sl ("stats");	1020	packet sl ("stats");
1038		1021
1039	if (pl->ob)
1040	{
1041	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1022	AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
1042	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1023	AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
1043	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1024	AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
1044	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1025	AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
1045	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1026	AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
1046	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1027	AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
1047	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1028	AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
1048	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1049	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1050	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1051	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1029	AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
1052	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1030	AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
		1031	AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
		1032	AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
		1033	AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
1053	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1034	AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
1054	}
1055		1035
1056	if (pl->socket->exp64)
1057	for (int s = 0; s < NUM_SKILLS; s++)	1036	for (int s = 0; s < NUM_SKILLS; s++)
1058	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1037	if (object *skill = pl->last_skill_ob[s])
		1038	if (skill->stats.exp != ns->last_skill_exp [s])
1059	{	1039	{
		1040	ns->last_skill_exp [s] = skill->stats.exp;
		1041
1060	/* Always send along the level if exp changes. This is only	1042	/* Always send along the level if exp changes. This is only
1061	* 1 extra byte, but keeps processing simpler.	1043	* 1 extra byte, but keeps processing simpler.
1062	*/	1044	*/
1063	sl << uint8 (s + CS_STAT_SKILLINFO)	1045	sl << uint8 (s + CS_STAT_SKILLINFO)
1064	<< uint8 (pl->last_skill_ob[s]->level)	1046	<< uint8 (skill->level)
1065	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1047	<< uint64 (skill->stats.exp);
1066
1067	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1068	}	1048	}
1069		1049
1070	if (pl->socket->exp64)
1071	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1050	AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
1072	else
1073	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1074
1075	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1051	AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
1076	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1052	AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
1077	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1053	AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
1078	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1054	AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
1079	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1055	AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED);
1080	AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);	1056	AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
1081	AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);	1057	AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
1082	AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);	1058	AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
		1059
1083	flags = 0;	1060	flags = 0;
1084		1061
1085	if (pl->fire_on)	1062	if (pl->fire_on)
1086	flags \|= SF_FIREON;	1063	flags \|= SF_FIREON;
1087		1064
1088	if (pl->run_on)	1065	if (pl->run_on)
1089	flags \|= SF_RUNON;	1066	flags \|= SF_RUNON;
1090		1067
1091	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1068	AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
1092		1069
1093	if (pl->socket->sc_version < 1025)	1070	if (ns->sc_version < 1025)
1094	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1071	{ AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1095	else	1072	else
1096	for (int i = 0; i < NROFATTACKS; i++)	1073	for (int i = 0; i < NROFATTACKS; i++)
1097	{	1074	{
1098	/* Skip ones we won't send */	1075	/* Skip ones we won't send */
1099	if (atnr_cs_stat[i] == -1)	1076	if (atnr_cs_stat[i] == -1)
1100	continue;	1077	continue;
1101		1078
1102	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1079	AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
1103	}	1080	}
1104		1081
1105	if (pl->socket->monitor_spells)	1082	if (pl->ns->monitor_spells)
1106	{	1083	{
1107	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1084	AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1108	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1085	AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
1109	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1086	AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
1110	}	1087	}
1111		1088
1112	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1089	rangetostring (ob, buf); /* we want use the new fire & run system in new client */
1113	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1090	AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
1114	set_title (pl->ob, buf);	1091	set_title (ob, buf);
1115	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1092	AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
1116		1093
1117	/* Only send it away if we have some actual data */	1094	/* Only send it away if we have some actual data */
1118	if (sl.length () > 6)	1095	if (sl.length () > 6)
1119	pl->socket->send_packet (sl);	1096	ns->send_packet (sl);
1120	}	1097	}
1121		1098
1122	/**	1099	/**
1123	* Tells the client that here is a player it should start using.	1100	* Tells the client that here is a player it should start using.
1124	*/	1101	*/
1125	void	1102	void
1126	esrv_new_player (player *pl, uint32 weight)	1103	esrv_new_player (player *pl, uint32 weight)
1127	{	1104	{
1128	pl->last_weight = weight;
1129
1130	packet sl ("player");	1105	packet sl ("player");
1131		1106
1132	sl << uint32 (pl->ob->count)	1107	sl << uint32 (pl->ob->count)
1133	<< uint32 (weight)	1108	<< uint32 (weight)
1134	<< uint32 (pl->ob->face->number)	1109	<< uint32 (pl->ob->face->number)
1135	<< data8 (pl->ob->name);	1110	<< data8 (pl->ob->name);
1136		1111
		1112	pl->ns->last_weight = weight;
1137	pl->socket->send_packet (sl);	1113	pl->ns->send_packet (sl);
1138	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1114	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1139	}	1115	}
1140		1116
1141	/**	1117	/**
1142	* Need to send an animation sequence to the client.	1118	* Need to send an animation sequence to the client.
…		…
1529	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1505	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1530		1506
1531	/* If there is no object for this space, or if the face for the object	1507	/* If there is no object for this space, or if the face for the object
1532	* is the blank face, set the smoothlevel to zero.	1508	* is the blank face, set the smoothlevel to zero.
1533	*/	1509	*/
1534	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1510	if (!ob \|\| ob->face == blank_face)
1535	smoothlevel = 0;	1511	smoothlevel = 0;
1536	else	1512	else
1537	{	1513	{
1538	smoothlevel = ob->smoothlevel;	1514	smoothlevel = ob->smoothlevel;
1539	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1515	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
…		…
1574	if (ns->EMI_smooth)	1550	if (ns->EMI_smooth)
1575	result += 1; /One byte for smoothlevel /	1551	result += 1; /One byte for smoothlevel /
1576	}	1552	}
1577		1553
1578	return result;	1554	return result;
		1555	}
		1556
		1557	// prefetch (and touch) all maps within a specific distancd
		1558	static void
		1559	prefetch_surrounding_maps (maptile *map, int distance)
		1560	{
		1561	map->last_access = runtime;
		1562
		1563	if (--distance)
		1564	for (int dir = 4; --dir; )
		1565	if (const shstr &path = map->tile_path [dir])
		1566	if (maptile *&neigh = map->tile_map [dir])
		1567	prefetch_surrounding_maps (neigh, distance);
		1568	else
		1569	neigh = maptile::find_async (path, map);
		1570	}
		1571
		1572	// prefetch a generous area around the player
		1573	static void
		1574	prefetch_surrounding_maps (object *op)
		1575	{
		1576	prefetch_surrounding_maps (op->map, 3);
1579	}	1577	}
1580		1578
1581	/**	1579	/**
1582	* This function uses the new map1 protocol command to send the map	1580	* This function uses the new map1 protocol command to send the map
1583	* to the client. It is necessary because the old map command supports	1581	* to the client. It is necessary because the old map command supports
…		…
1589	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1587	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1590	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1588	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1591	* and use the other 4 bits for other informatiion. For full documentation	1589	* and use the other 4 bits for other informatiion. For full documentation
1592	* of what we send, see the doc/Protocol file.	1590	* of what we send, see the doc/Protocol file.
1593	* I will describe internally what we do:	1591	* I will describe internally what we do:
1594	* the socket->lastmap shows how the map last looked when sent to the client.	1592	* the ns->lastmap shows how the map last looked when sent to the client.
1595	* in the lastmap structure, there is a cells array, which is set to the	1593	* in the lastmap structure, there is a cells array, which is set to the
1596	* maximum viewable size (As set in config.h).	1594	* maximum viewable size (As set in config.h).
1597	* in the cells, there are faces and a count value.	1595	* in the cells, there are faces and a count value.
1598	* we use the count value to hold the darkness value. If -1, then this space	1596	* we use the count value to hold the darkness value. If -1, then this space
1599	* is not viewable.	1597	* is not viewable.
…		…
1610	uint8 eentrysize;	1608	uint8 eentrysize;
1611	uint16 ewhatstart, ewhatflag;	1609	uint16 ewhatstart, ewhatflag;
1612	uint8 extendedinfos;	1610	uint8 extendedinfos;
1613	maptile *m;	1611	maptile *m;
1614		1612
1615	client &socket = *pl->contr->socket;	1613	client &socket = *pl->contr->ns;
		1614
		1615	if (!pl->active)
		1616	return;
1616		1617
1617	check_map_change (pl->contr);	1618	check_map_change (pl->contr);
		1619	prefetch_surrounding_maps (pl);
1618		1620
1619	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");	1621	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1620	packet esl;	1622	packet esl;
1621		1623
1622	startlen = sl.length ();	1624	startlen = sl.length ();
…		…
1670	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1672	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1671	{	1673	{
1672	ax = 0;	1674	ax = 0;
1673	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1675	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1674	{	1676	{
1675
1676	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1677	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1677		1678
1678	/* If this space is out of the normal viewable area, we only check	1679	/* If this space is out of the normal viewable area, we only check
1679	* the heads value ax or ay will only be greater than what	1680	* the heads value ax or ay will only be greater than what
1680	* the client wants if using the map1a command - this is because	1681	* the client wants if using the map1a command - this is because
…		…
1742	map_clearcell (&lastcell, 0, 0, 0, -1);	1743	map_clearcell (&lastcell, 0, 0, 0, -1);
1743	}	1744	}
1744	}	1745	}
1745	else if (d > 3)	1746	else if (d > 3)
1746	{	1747	{
		1748	m->touch ();
		1749
1747	int need_send = 0, count;	1750	int need_send = 0, count;
1748		1751
1749	/* This block deals with spaces that are not visible for whatever	1752	/* This block deals with spaces that are not visible for whatever
1750	* reason. Still may need to send the head for this space.	1753	* reason. Still may need to send the head for this space.
1751	*/	1754	*/
…		…
1784	else	1787	else
1785	sl.reset (oldlen);	1788	sl.reset (oldlen);
1786	}	1789	}
1787	else	1790	else
1788	{	1791	{
		1792	m->touch ();
		1793
1789	/* In this block, the space is visible or there are head objects	1794	/* In this block, the space is visible or there are head objects
1790	* we need to send.	1795	* we need to send.
1791	*/	1796	*/
1792		1797
1793	/* Rather than try to figure out what everything that we might	1798	/* Rather than try to figure out what everything that we might
…		…
1987	void	1992	void
1988	draw_client_map (object *pl)	1993	draw_client_map (object *pl)
1989	{	1994	{
1990	int i, j;	1995	int i, j;
1991	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */	1996	sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
1992	New_Face face, floor;	1997	facetile face, floor;
1993	New_Face *floor2;	1998	facetile *floor2;
1994	int d, mflags;	1999	int d, mflags;
1995	struct Map newmap;	2000	struct Map newmap;
1996	maptile m, pm;	2001	maptile m, pm;
1997		2002
1998	if (pl->type != PLAYER)	2003	if (pl->type != PLAYER)
…		…
2010	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	2015	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2011	return;	2016	return;
2012		2017
2013	memset (&newmap, 0, sizeof (struct Map));	2018	memset (&newmap, 0, sizeof (struct Map));
2014		2019
2015	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	2020	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2016	{
2017	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	2021	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2018	{	2022	{
2019	ax = i;	2023	ax = i;
2020	ay = j;	2024	ay = j;
2021	m = pm;	2025	m = pm;
2022	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2026	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2023		2027
2024	if (mflags & P_OUT_OF_MAP)	2028	if (mflags & P_OUT_OF_MAP)
2025	continue;	2029	continue;
2026		2030
2027	if (mflags & P_NEED_UPDATE)
2028	update_position (m, ax, ay);
2029
2030	/* If a map is visible to the player, we don't want to swap it out	2031	/* If a map is visible to the player, we don't want to swap it out
2031	* just to reload it. This should really call something like	2032	* just to reload it. This should really call something like
2032	* swap_map, but this is much more efficient and 'good enough'	2033	* swap_map, but this is much more efficient and 'good enough'
2033	*/	2034	*/
2034	if (mflags & P_NEW_MAP)	2035	if (mflags & P_NEW_MAP)
2035	m->timeout = 50;	2036	m->timeout = 50;
2036	}	2037	}
2037	}	2038
2038	/* do LOS after calls to update_position */	2039	/* do LOS after calls to update_position */
2039	if (pl->contr->do_los)	2040	if (pl->contr->do_los)
2040	{	2041	{
2041	update_los (pl);	2042	update_los (pl);
2042	pl->contr->do_los = 0;	2043	pl->contr->do_los = 0;
…		…
2057		2058
2058	/*****************************************************************************/	2059	/*****************************************************************************/
2059	void	2060	void
2060	send_plugin_custom_message (object pl, char buf)	2061	send_plugin_custom_message (object pl, char buf)
2061	{	2062	{
2062	pl->contr->socket->send_packet (buf);	2063	pl->contr->ns->send_packet (buf);
2063	}	2064	}
2064		2065
2065	/**	2066	/**
2066	* This sends the skill number to name mapping. We ignore	2067	* This sends the skill number to name mapping. We ignore
2067	* the params - we always send the same info no matter what.	2068	* the params - we always send the same info no matter what.
…		…
2112	* it then sends an updspell packet for each spell that has changed in this way	2113	* it then sends an updspell packet for each spell that has changed in this way
2113	*/	2114	*/
2114	void	2115	void
2115	esrv_update_spells (player *pl)	2116	esrv_update_spells (player *pl)
2116	{	2117	{
		2118	if (!pl->ns)
		2119	return;
		2120
2117	if (!pl->socket->monitor_spells)	2121	if (!pl->ns->monitor_spells)
2118	return;	2122	return;
2119		2123
2120	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2124	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2121	{	2125	{
2122	if (spell->type == SPELL)	2126	if (spell->type == SPELL)
…		…
2152		2156
2153	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2157	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2154	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2158	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2155	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2159	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2156		2160
2157	pl->socket->send_packet (sl);	2161	pl->ns->send_packet (sl);
2158	}	2162	}
2159	}	2163	}
2160	}	2164	}
2161	}	2165	}
2162		2166
2163	void	2167	void
2164	esrv_remove_spell (player pl, object spell)	2168	esrv_remove_spell (player pl, object spell)
2165	{	2169	{
2166	if (!pl->socket->monitor_spells)	2170	if (!pl->ns->monitor_spells)
2167	return;	2171	return;
2168		2172
2169	if (!pl \|\| !spell \|\| spell->env != pl->ob)	2173	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2170	{	2174	{
2171	LOG (llevError, "Invalid call to esrv_remove_spell");	2175	LOG (llevError, "Invalid call to esrv_remove_spell");
…		…
2174		2178
2175	packet sl ("delspell");	2179	packet sl ("delspell");
2176		2180
2177	sl << uint32 (spell->count);	2181	sl << uint32 (spell->count);
2178		2182
2179	pl->socket->send_packet (sl);	2183	pl->ns->send_packet (sl);
2180	}	2184	}
2181		2185
2182	/* appends the spell spell to the Socklist we will send the data to. /	2186	/* appends the spell spell to the Socklist we will send the data to. /
2183	static void	2187	static void
2184	append_spell (player pl, packet &sl, object spell)	2188	append_spell (player pl, packet &sl, object spell)
…		…
2232	{	2236	{
2233	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2237	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2234	return;	2238	return;
2235	}	2239	}
2236		2240
2237	if (!pl->socket->monitor_spells)	2241	if (!pl->ns->monitor_spells)
2238	return;	2242	return;
2239		2243
2240	packet sl ("addspell");	2244	packet sl ("addspell");
2241		2245
2242	if (!spell)	2246	if (!spell)
…		…
2259	if (spell->type != SPELL)	2263	if (spell->type != SPELL)
2260	continue;	2264	continue;
2261		2265
2262	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2266	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2263	{	2267	{
2264	pl->socket->send_packet (sl);	2268	pl->ns->send_packet (sl);
2265		2269
2266	sl.reset ();	2270	sl.reset ();
2267	sl << "addspell ";	2271	sl << "addspell ";
2268	}	2272	}
2269		2273
…		…
2283	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2287	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2284	fatal (0);	2288	fatal (0);
2285	}	2289	}
2286		2290
2287	/* finally, we can send the packet */	2291	/* finally, we can send the packet */
2288	pl->socket->send_packet (sl);	2292	pl->ns->send_packet (sl);
2289	}	2293	}
2290		2294

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs. Revision 1.64 by pippijn, Sat Jan 20 13:47:17 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.47 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.64 by pippijn, Sat Jan 20 13:47:17 2007 UTC