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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.56 by root, Mon Jan 1 12:28:47 2007 UTC

…		…
138	}	138	}
139		139
140	static void	140	static void
141	clear_map (player *pl)	141	clear_map (player *pl)
142	{	142	{
143	memset (&pl->socket->lastmap, 0, sizeof (pl->socket->lastmap));	143	memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
144		144
145	if (pl->socket->newmapcmd == 1)	145	if (pl->ns->newmapcmd == 1)
146	pl->socket->send_packet ("newmap");	146	pl->ns->send_packet ("newmap");
147		147
148	pl->socket->floorbox_reset ();	148	pl->ns->floorbox_reset ();
149	}	149	}
150		150
151	/** check for map change and send new map data */	151	/** check for map change and send new map data */
152	static void	152	static void
153	check_map_change (player *pl)	153	check_map_change (player *pl)
154	{	154	{
155	client &socket = *pl->socket;	155	client &socket = *pl->ns;
156	object *ob = pl->ob;	156	object *ob = pl->ob;
157	char buf[MAX_BUF]; /* eauugggh */	157	char buf[MAX_BUF]; /* eauugggh */
158		158
159	if (socket.current_map != ob->map)	159	if (socket.current_map != ob->map)
160	{	160	{
…		…
176	flags \|= 4;	176	flags \|= 4;
177	if (ob->map->tile_path[3])	177	if (ob->map->tile_path[3])
178	flags \|= 8;	178	flags \|= 8;
179		179
180	snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",	180	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);	181	flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, &ob->map->path);
182	}	182	}
183	else	183	else
184	snprintf (buf, MAX_BUF, "mapinfo current");	184	snprintf (buf, MAX_BUF, "mapinfo current");
185		185
186	socket.send_packet (buf);	186	socket.send_packet (buf);
…		…
280	buf += 8;	280	buf += 8;
281		281
282	// initial map and its origin	282	// initial map and its origin
283	maptile *map = pl->ob->map;	283	maptile *map = pl->ob->map;
284	sint16 dx, dy;	284	sint16 dx, dy;
285	int mapx = pl->socket->mapx / 2 - pl->ob->x;	285	int mapx = pl->ns->mapx / 2 - pl->ob->x;
286	int mapy = pl->socket->mapy / 2 - pl->ob->y;	286	int mapy = pl->ns->mapy / 2 - pl->ob->y;
287	int max_distance = 8; // limit maximum path length to something generous	287	int max_distance = 8; // limit maximum path length to something generous
288		288
289	while (*buf && map && max_distance)	289	while (*buf && map && max_distance)
290	{	290	{
291	int dir = *buf++;	291	int dir = *buf++;
…		…
334	if (map->tile_path[2])	334	if (map->tile_path[2])
335	flags \|= 4;	335	flags \|= 4;
336	if (map->tile_path[3])	336	if (map->tile_path[3])
337	flags \|= 8;	337	flags \|= 8;
338		338
339	snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);	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	}	340	}
341	else	341	else
342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);	342	snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
343	}	343	}
344	else	344	else
345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);	345	snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
346		346
347	pl->socket->send_packet (bigbuf);	347	pl->ns->send_packet (bigbuf);
348	}	348	}
349		349
350	/** This is the Setup cmd - easy first implementation */	350	/** This is the Setup cmd - easy first implementation */
351	void	351	void
352	SetUp (char buf, int len, client ns)	352	SetUp (char buf, int len, client ns)
…		…
399	{	399	{
400	ns->sound = atoi (param);	400	ns->sound = atoi (param);
401	safe_strcat (cmdback, param, &slen, HUGE_BUF);	401	safe_strcat (cmdback, param, &slen, HUGE_BUF);
402	}	402	}
403	else if (!strcmp (cmd, "exp64"))	403	else if (!strcmp (cmd, "exp64"))
404	{
405	ns->exp64 = atoi (param);
406	safe_strcat (cmdback, param, &slen, HUGE_BUF);	404	safe_strcat (cmdback, param, &slen, HUGE_BUF);
407	}
408	else if (!strcmp (cmd, "spellmon"))	405	else if (!strcmp (cmd, "spellmon"))
409	{	406	{
410	ns->monitor_spells = atoi (param);	407	ns->monitor_spells = atoi (param);
411	safe_strcat (cmdback, param, &slen, HUGE_BUF);	408	safe_strcat (cmdback, param, &slen, HUGE_BUF);
412	}	409	}
…		…
569	* it either has to be here or init_sockets needs to be exported.	566	* it either has to be here or init_sockets needs to be exported.
570	*/	567	*/
571	void	568	void
572	AddMeCmd (char buf, int len, client ns)	569	AddMeCmd (char buf, int len, client ns)
573	{	570	{
574	if (ns->status != Ns_Add \|\| add_player (ns))	571	INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
575	ns->send_packet ("addme_failed");
576	else
577	ns->send_packet ("addme_success");
578	}	572	}
579		573
580	/** Reply to ExtendedInfos command */	574	/** Reply to ExtendedInfos command */
581	void	575	void
582	ToggleExtendedInfos (char buf, int len, client ns)	576	ToggleExtendedInfos (char buf, int len, client ns)
…		…
719	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))	713	if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
720	esrv_send_face (ns, smoothface, 0);	714	esrv_send_face (ns, smoothface, 0);
721		715
722	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;	716	ns->faces_sent[face] \|= NS_FACESENT_SMOOTH;
723		717
724	packet sl;	718	packet sl ("smooth");
725		719
726	sl << "smooth "
727	<< uint16 (face)	720	sl << uint16 (face)
728	<< uint16 (smoothface);	721	<< uint16 (smoothface);
729		722
730	ns->send_packet (sl);	723	ns->send_packet (sl);
731	}	724	}
732		725
…		…
809	int time = FABS (pl->ob->speed) < 0.001	802	int time = FABS (pl->ob->speed) < 0.001
810	? time = MAX_TIME * 100	803	? time = MAX_TIME * 100
811	: time = (int) (MAX_TIME / FABS (pl->ob->speed));	804	: time = (int) (MAX_TIME / FABS (pl->ob->speed));
812		805
813	/* Send confirmation of command execution now */	806	/* Send confirmation of command execution now */
814	packet sl;	807	packet sl ("comc");
815	sl << "comc " << uint16 (cmdid) << uint32 (time);	808	sl << uint16 (cmdid) << uint32 (time);
816	pl->socket->send_packet (sl);	809	pl->ns->send_packet (sl);
817	}	810	}
818
819		811
820	/** This is a reply to a previous query. */	812	/** This is a reply to a previous query. */
821	void	813	void
822	ReplyCmd (char buf, int len, player pl)	814	ReplyCmd (char buf, int len, client ns)
823	{	815	{
		816	if (ns->state == ST_CUSTOM)
		817	{
		818	INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
		819	return;
		820	}
		821
		822	if (!ns->pl)
		823	return; //TODO: depends on the exact reply we are after
		824	//TODO: but right now, we always have a ns->pl
		825
		826	player *pl = ns->pl;
		827
824	/* This is to synthesize how the data would be stored if it	828	/* This is to synthesize how the data would be stored if it
825	* was normally entered. A bit of a hack, and should be cleaned up	829	* was normally entered. A bit of a hack, and should be cleaned up
826	* once all the X11 code is removed from the server.	830	* once all the X11 code is removed from the server.
827	*	831	*
828	* We pass 13 to many of the functions because this way they	832	* We pass 13 to many of the functions because this way they
…		…
831	*/	835	*/
832	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);	836	snprintf (pl->write_buf, sizeof (pl->write_buf), ":%s", buf);
833		837
834	/* this avoids any hacking here */	838	/* this avoids any hacking here */
835		839
836	switch (pl->state)	840	switch (ns->state)
837	{	841	{
838	case ST_PLAYING:	842	case ST_PLAYING:
839	LOG (llevError, "Got reply message with ST_PLAYING input state\n");	843	LOG (llevError, "Got reply message with ST_PLAYING input state\n");
840	break;	844	break;
841		845
842	case ST_PLAY_AGAIN:
843	/* We can check this for return value (2==quit). Maybe we
844	* should, and do something appropriate?
845	*/
846	receive_play_again (pl->ob, buf[0]);
847	break;
848
849	case ST_ROLL_STAT:
850	key_roll_stat (pl->ob, buf[0]);
851	break;
852
853	case ST_CHANGE_CLASS:	846	case ST_CHANGE_CLASS:
854
855	key_change_class (pl->ob, buf[0]);	847	key_change_class (pl->ob, buf[0]);
856	break;	848	break;
857		849
858	case ST_CONFIRM_QUIT:	850	case ST_CONFIRM_QUIT:
859	key_confirm_quit (pl->ob, buf[0]);	851	key_confirm_quit (pl->ob, buf[0]);
860	break;	852	break;
861		853
862	case ST_CONFIGURE:
863	LOG (llevError, "In client input handling, but into configure state\n");
864	pl->state = ST_PLAYING;
865	break;
866
867	case ST_GET_NAME:
868	receive_player_name (pl->ob, 13);
869	break;
870
871	case ST_GET_PASSWORD:
872	case ST_CONFIRM_PASSWORD:
873	receive_player_password (pl->ob, 13);
874	break;
875
876	case ST_GET_PARTY_PASSWORD: /* Get password for party */	854	case ST_GET_PARTY_PASSWORD: /* Get password for party */
877	receive_party_password (pl->ob, 13);	855	receive_party_password (pl->ob, 13);
878	break;	856	break;
879		857
880	default:	858	default:
881	LOG (llevError, "Unknown input state: %d\n", pl->state);	859	LOG (llevError, "Unknown input state: %d\n", ns->state);
882	}	860	}
883	}	861	}
884		862
885	/**	863	/**
886	* Client tells its version. If there is a mismatch, we close the	864	* Client tells its version. If there is a mismatch, we close the
…		…
1033	esrv_update_stats (player *pl)	1011	esrv_update_stats (player *pl)
1034	{	1012	{
1035	char buf[MAX_BUF];	1013	char buf[MAX_BUF];
1036	uint16 flags;	1014	uint16 flags;
1037		1015
1038	packet sl;	1016	if (!pl->ns)
1039	sl << "stats ";	1017	return;
		1018
		1019	packet sl ("stats");
1040		1020
1041	if (pl->ob)	1021	if (pl->ob)
1042	{	1022	{
1043	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);	1023	AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
1044	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);	1024	AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
1045	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);	1025	AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
1046	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);	1026	AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
1047	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);	1027	AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
1048	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);	1028	AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
1049	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);	1029	AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
1050	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
1051	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1052	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
1053	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);	1030	AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
1054	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);	1031	AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
		1032	AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
		1033	AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
		1034	AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
1055	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);	1035	AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
1056	}	1036	}
1057		1037
1058	if (pl->socket->exp64)
1059	for (int s = 0; s < NUM_SKILLS; s++)	1038	for (int s = 0; s < NUM_SKILLS; s++)
1060	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)	1039	if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
1061	{	1040	{
1062	/* Always send along the level if exp changes. This is only	1041	/* Always send along the level if exp changes. This is only
1063	* 1 extra byte, but keeps processing simpler.	1042	* 1 extra byte, but keeps processing simpler.
1064	*/	1043	*/
1065	sl << uint8 (s + CS_STAT_SKILLINFO)	1044	sl << uint8 (s + CS_STAT_SKILLINFO)
1066	<< uint8 (pl->last_skill_ob[s]->level)	1045	<< uint8 (pl->last_skill_ob[s]->level)
1067	<< uint64 (pl->last_skill_ob[s]->stats.exp);	1046	<< uint64 (pl->last_skill_ob[s]->stats.exp);
1068		1047
1069	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;	1048	pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
1070	}	1049	}
1071		1050
1072	if (pl->socket->exp64)
1073	{ AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }	1051	AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64);
1074	else
1075	{ AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
1076
1077	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);	1052	AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
1078	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);	1053	AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
1079	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);	1054	AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
1080	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);	1055	AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
1081	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);	1056	AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
…		…
1090	if (pl->run_on)	1065	if (pl->run_on)
1091	flags \|= SF_RUNON;	1066	flags \|= SF_RUNON;
1092		1067
1093	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);	1068	AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
1094		1069
1095	if (pl->socket->sc_version < 1025)	1070	if (pl->ns->sc_version < 1025)
1096	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }	1071	{ AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
1097	else	1072	else
1098	for (int i = 0; i < NROFATTACKS; i++)	1073	for (int i = 0; i < NROFATTACKS; i++)
1099	{	1074	{
1100	/* Skip ones we won't send */	1075	/* Skip ones we won't send */
…		…
1102	continue;	1077	continue;
1103		1078
1104	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);	1079	AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
1105	}	1080	}
1106		1081
1107	if (pl->socket->monitor_spells)	1082	if (pl->ns->monitor_spells)
1108	{	1083	{
1109	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);	1084	AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
1110	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);	1085	AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
1111	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);	1086	AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
1112	}	1087	}
1113		1088
1114	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */	1089	rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
1115	AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);	1090	AddIfString (pl->ns->stats.range, buf, CS_STAT_RANGE);
1116	set_title (pl->ob, buf);	1091	set_title (pl->ob, buf);
1117	AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);	1092	AddIfString (pl->ns->stats.title, buf, CS_STAT_TITLE);
1118		1093
1119	/* Only send it away if we have some actual data */	1094	/* Only send it away if we have some actual data */
1120	if (sl.length () > 6)	1095	if (sl.length () > 6)
1121	pl->socket->send_packet (sl);	1096	pl->ns->send_packet (sl);
1122	}	1097	}
1123		1098
1124	/**	1099	/**
1125	* 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.
1126	*/	1101	*/
1127	void	1102	void
1128	esrv_new_player (player *pl, uint32 weight)	1103	esrv_new_player (player *pl, uint32 weight)
1129	{	1104	{
1130	pl->last_weight = weight;	1105	pl->last_weight = weight;
1131		1106
1132	packet sl;	1107	packet sl ("player");
1133	sl << "player ";
1134		1108
1135	sl << uint32 (pl->ob->count)	1109	sl << uint32 (pl->ob->count)
1136	<< uint32 (weight)	1110	<< uint32 (weight)
1137	<< uint32 (pl->ob->face->number)	1111	<< uint32 (pl->ob->face->number)
1138	<< data8 (pl->ob->name);	1112	<< data8 (pl->ob->name);
1139		1113
1140	pl->socket->send_packet (sl);	1114	pl->ns->send_packet (sl);
1141	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);	1115	SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
1142	}	1116	}
1143		1117
1144	/**	1118	/**
1145	* Need to send an animation sequence to the client.	1119	* Need to send an animation sequence to the client.
…		…
1159	{	1133	{
1160	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);	1134	LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
1161	return;	1135	return;
1162	}	1136	}
1163		1137
1164	packet sl;	1138	packet sl ("anim");
1165		1139
1166	sl << "anim "
1167	<< uint16 (anim_num)	1140	sl << uint16 (anim_num)
1168	<< uint16 (0); /* flags - not used right now */	1141	<< uint16 (0); /* flags - not used right now */
1169		1142
1170	/* Build up the list of faces. Also, send any information (ie, the	1143	/* Build up the list of faces. Also, send any information (ie, the
1171	* the face itself) down to the client.	1144	* the face itself) down to the client.
1172	*/	1145	*/
…		…
1533	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);	1506	ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
1534		1507
1535	/* If there is no object for this space, or if the face for the object	1508	/* If there is no object for this space, or if the face for the object
1536	* is the blank face, set the smoothlevel to zero.	1509	* is the blank face, set the smoothlevel to zero.
1537	*/	1510	*/
1538	if (!ob \|\| ob->face == blank_face \|\| MAP_NOSMOOTH (mp))	1511	if (!ob \|\| ob->face == blank_face)
1539	smoothlevel = 0;	1512	smoothlevel = 0;
1540	else	1513	else
1541	{	1514	{
1542	smoothlevel = ob->smoothlevel;	1515	smoothlevel = ob->smoothlevel;
1543	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))	1516	if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
…		…
1593	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off	1566	* we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
1594	* maps no sense. Instead, we actually really only use 12 bits for coordinates,	1567	* maps no sense. Instead, we actually really only use 12 bits for coordinates,
1595	* and use the other 4 bits for other informatiion. For full documentation	1568	* and use the other 4 bits for other informatiion. For full documentation
1596	* of what we send, see the doc/Protocol file.	1569	* of what we send, see the doc/Protocol file.
1597	* I will describe internally what we do:	1570	* I will describe internally what we do:
1598	* the socket->lastmap shows how the map last looked when sent to the client.	1571	* the ns->lastmap shows how the map last looked when sent to the client.
1599	* in the lastmap structure, there is a cells array, which is set to the	1572	* in the lastmap structure, there is a cells array, which is set to the
1600	* maximum viewable size (As set in config.h).	1573	* maximum viewable size (As set in config.h).
1601	* in the cells, there are faces and a count value.	1574	* in the cells, there are faces and a count value.
1602	* we use the count value to hold the darkness value. If -1, then this space	1575	* we use the count value to hold the darkness value. If -1, then this space
1603	* is not viewable.	1576	* is not viewable.
…		…
1614	uint8 eentrysize;	1587	uint8 eentrysize;
1615	uint16 ewhatstart, ewhatflag;	1588	uint16 ewhatstart, ewhatflag;
1616	uint8 extendedinfos;	1589	uint8 extendedinfos;
1617	maptile *m;	1590	maptile *m;
1618		1591
1619	client &socket = *pl->contr->socket;	1592	client &socket = *pl->contr->ns;
1620		1593
1621	check_map_change (pl->contr);	1594	check_map_change (pl->contr);
1622		1595
1623	packet sl;	1596	packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
1624	packet esl;	1597	packet esl;
1625		1598
1626	sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
1627	startlen = sl.length ();	1599	startlen = sl.length ();
1628		1600
1629	/Extendedmapinfo structure initialisation /	1601	/Extendedmapinfo structure initialisation /
1630	if (socket.ext_mapinfos)	1602	if (socket.ext_mapinfos)
1631	{	1603	{
…		…
1675	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)	1647	for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
1676	{	1648	{
1677	ax = 0;	1649	ax = 0;
1678	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)	1650	for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
1679	{	1651	{
1680
1681	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;	1652	emask = mask = (ax & 0x3f) << 10 \| (ay & 0x3f) << 4;
1682		1653
1683	/* If this space is out of the normal viewable area, we only check	1654	/* If this space is out of the normal viewable area, we only check
1684	* the heads value ax or ay will only be greater than what	1655	* the heads value ax or ay will only be greater than what
1685	* the client wants if using the map1a command - this is because	1656	* the client wants if using the map1a command - this is because
…		…
1747	map_clearcell (&lastcell, 0, 0, 0, -1);	1718	map_clearcell (&lastcell, 0, 0, 0, -1);
1748	}	1719	}
1749	}	1720	}
1750	else if (d > 3)	1721	else if (d > 3)
1751	{	1722	{
		1723	m->touch ();
		1724
1752	int need_send = 0, count;	1725	int need_send = 0, count;
1753		1726
1754	/* This block deals with spaces that are not visible for whatever	1727	/* This block deals with spaces that are not visible for whatever
1755	* reason. Still may need to send the head for this space.	1728	* reason. Still may need to send the head for this space.
1756	*/	1729	*/
…		…
1789	else	1762	else
1790	sl.reset (oldlen);	1763	sl.reset (oldlen);
1791	}	1764	}
1792	else	1765	else
1793	{	1766	{
		1767	m->touch ();
		1768
1794	/* In this block, the space is visible or there are head objects	1769	/* In this block, the space is visible or there are head objects
1795	* we need to send.	1770	* we need to send.
1796	*/	1771	*/
1797		1772
1798	/* Rather than try to figure out what everything that we might	1773	/* Rather than try to figure out what everything that we might
…		…
2015	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)	1990	if (pm == NULL \|\| pm->in_memory != MAP_IN_MEMORY)
2016	return;	1991	return;
2017		1992
2018	memset (&newmap, 0, sizeof (struct Map));	1993	memset (&newmap, 0, sizeof (struct Map));
2019		1994
2020	for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)	1995	for (j = (pl->y - pl->contr->ns->mapy / 2); j < (pl->y + (pl->contr->ns->mapy + 1) / 2); j++)
2021	{
2022	for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)	1996	for (i = (pl->x - pl->contr->ns->mapx / 2); i < (pl->x + (pl->contr->ns->mapx + 1) / 2); i++)
2023	{	1997	{
2024	ax = i;	1998	ax = i;
2025	ay = j;	1999	ay = j;
2026	m = pm;	2000	m = pm;
2027	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);	2001	mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
2028		2002
2029	if (mflags & P_OUT_OF_MAP)	2003	if (mflags & P_OUT_OF_MAP)
2030	continue;	2004	continue;
2031		2005
2032	if (mflags & P_NEED_UPDATE)
2033	update_position (m, ax, ay);
2034
2035	/* If a map is visible to the player, we don't want to swap it out	2006	/* If a map is visible to the player, we don't want to swap it out
2036	* just to reload it. This should really call something like	2007	* just to reload it. This should really call something like
2037	* swap_map, but this is much more efficient and 'good enough'	2008	* swap_map, but this is much more efficient and 'good enough'
2038	*/	2009	*/
2039	if (mflags & P_NEW_MAP)	2010	if (mflags & P_NEW_MAP)
2040	m->timeout = 50;	2011	m->timeout = 50;
2041	}	2012	}
2042	}	2013
2043	/* do LOS after calls to update_position */	2014	/* do LOS after calls to update_position */
2044	if (pl->contr->do_los)	2015	if (pl->contr->do_los)
2045	{	2016	{
2046	update_los (pl);	2017	update_los (pl);
2047	pl->contr->do_los = 0;	2018	pl->contr->do_los = 0;
…		…
2062		2033
2063	/*****************************************************************************/	2034	/*****************************************************************************/
2064	void	2035	void
2065	send_plugin_custom_message (object pl, char buf)	2036	send_plugin_custom_message (object pl, char buf)
2066	{	2037	{
2067	pl->contr->socket->send_packet (buf);	2038	pl->contr->ns->send_packet (buf);
2068	}	2039	}
2069		2040
2070	/**	2041	/**
2071	* This sends the skill number to name mapping. We ignore	2042	* This sends the skill number to name mapping. We ignore
2072	* the params - we always send the same info no matter what.	2043	* the params - we always send the same info no matter what.
…		…
2117	* it then sends an updspell packet for each spell that has changed in this way	2088	* it then sends an updspell packet for each spell that has changed in this way
2118	*/	2089	*/
2119	void	2090	void
2120	esrv_update_spells (player *pl)	2091	esrv_update_spells (player *pl)
2121	{	2092	{
		2093	if (!pl->ns)
		2094	return;
		2095
2122	if (!pl->socket->monitor_spells)	2096	if (!pl->ns->monitor_spells)
2123	return;	2097	return;
2124		2098
2125	for (object *spell = pl->ob->inv; spell; spell = spell->below)	2099	for (object *spell = pl->ob->inv; spell; spell = spell->below)
2126	{	2100	{
2127	if (spell->type == SPELL)	2101	if (spell->type == SPELL)
…		…
2157		2131
2158	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);	2132	if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
2159	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);	2133	if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
2160	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);	2134	if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
2161		2135
2162	pl->socket->send_packet (sl);	2136	pl->ns->send_packet (sl);
2163	}	2137	}
2164	}	2138	}
2165	}	2139	}
2166	}	2140	}
2167		2141
2168	void	2142	void
2169	esrv_remove_spell (player pl, object spell)	2143	esrv_remove_spell (player pl, object spell)
2170	{	2144	{
2171	if (!pl->socket->monitor_spells)	2145	if (!pl->ns->monitor_spells)
2172	return;	2146	return;
2173		2147
2174	if (!pl \|\| !spell \|\| spell->env != pl->ob)	2148	if (!pl \|\| !spell \|\| spell->env != pl->ob)
2175	{	2149	{
2176	LOG (llevError, "Invalid call to esrv_remove_spell");	2150	LOG (llevError, "Invalid call to esrv_remove_spell");
2177	return;	2151	return;
2178	}	2152	}
2179		2153
2180	packet sl;	2154	packet sl ("delspell");
2181		2155
2182	sl << "delspell "
2183	<< uint32 (spell->count);	2156	sl << uint32 (spell->count);
2184		2157
2185	pl->socket->send_packet (sl);	2158	pl->ns->send_packet (sl);
2186	}	2159	}
2187		2160
2188	/* appends the spell spell to the Socklist we will send the data to. /	2161	/* appends the spell spell to the Socklist we will send the data to. /
2189	static void	2162	static void
2190	append_spell (player pl, packet &sl, object spell)	2163	append_spell (player pl, packet &sl, object spell)
…		…
2238	{	2211	{
2239	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");	2212	LOG (llevError, "esrv_add_spells, tried to add a spell to a NULL player");
2240	return;	2213	return;
2241	}	2214	}
2242		2215
2243	if (!pl->socket->monitor_spells)	2216	if (!pl->ns->monitor_spells)
2244	return;	2217	return;
2245		2218
2246	packet sl;	2219	packet sl ("addspell");
2247	sl << "addspell ";
2248		2220
2249	if (!spell)	2221	if (!spell)
2250	{	2222	{
2251	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)	2223	for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
2252	{	2224	{
…		…
2266	if (spell->type != SPELL)	2238	if (spell->type != SPELL)
2267	continue;	2239	continue;
2268		2240
2269	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))	2241	if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
2270	{	2242	{
2271	pl->socket->send_packet (sl);	2243	pl->ns->send_packet (sl);
2272		2244
2273	sl.reset ();	2245	sl.reset ();
2274	sl << "addspell ";	2246	sl << "addspell ";
2275	}	2247	}
2276		2248
…		…
2290	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");	2262	LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
2291	fatal (0);	2263	fatal (0);
2292	}	2264	}
2293		2265
2294	/* finally, we can send the packet */	2266	/* finally, we can send the packet */
2295	pl->socket->send_packet (sl);	2267	pl->ns->send_packet (sl);
2296	}	2268	}
2297		2269

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC vs. Revision 1.56 by root, Mon Jan 1 12:28:47 2007 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.46 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.56 by root, Mon Jan 1 12:28:47 2007 UTC