- Reversed revision #9415 (messages with server_tick field being sent as soon as possible) since it didn't fix the client synchronization issue.

- clif_parse_TickSend is sent immediately so the client gets accurate "pings"

Note: in Changelog, for my changes, if they're grouped together and in the same day I'm only gonna "sign" the bottom line.
All unsigned lines are assumed to be from the same person of the previous line (below). (easier searches =P)

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9443 54d463be-8e91-2dee-dedb-b68131a5f0ec

3 files changed, 4 insertions, 14 deletions

diff --git a/src/common/plugins.c b/src/common/plugins.c
index 9da12c35f..5951885a1 100644
--- a/src/common/plugins.c
+++ b/src/common/plugins.c
@@ -291,12 +291,6 @@ int plugins_config_read(const char *cfgName)
 	return 0;
 }
 
-/// backward compatibillity function
-int plugin_WFIFOSET(int fd,int len)
-{
-	return _WFIFOSET(fd,len,0);
-}
-
 void plugins_init (void)
 {
 	char *PLUGIN_CONF_FILENAME = "conf/plugin_athena.conf";
@@ -308,7 +302,7 @@ void plugins_init (void)
 	// networking
 	export_symbol (func_parse_table,	18);
 	export_symbol (RFIFOSKIP,			17);
-	export_symbol (plugin_WFIFOSET,		16);
+	export_symbol (WFIFOSET,			16);
 	export_symbol (delete_session,		15);
 	export_symbol (session,				14);
 	export_symbol (&fd_max,				13);
diff --git a/src/common/socket.c b/src/common/socket.c
index dcaf2cdf2..fafa229df 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -687,7 +687,7 @@ int realloc_writefifo(int fd, size_t addition)
 	return 0;
 }
 
-int _WFIFOSET(int fd, int len, char flush)
+int WFIFOSET(int fd,int len)
 {
 	size_t newreserve;
 	struct socket_data *s = session[fd];
@@ -712,9 +712,7 @@ int _WFIFOSET(int fd, int len, char flush)
 	// For inter-server connections, let the reserve be 1/4th of the link size.
 	newreserve = s->wdata_size + (s->max_wdata>=FIFOSIZE_SERVERLINK?FIFOSIZE_SERVERLINK/4:wfifo_size);
 
-	if( flush )
-		flush_fifo(fd);
-	else if(s->wdata_size >= frame_size)
+	if(s->wdata_size >= frame_size)
 		send_from_fifo(fd);
 
 	// realloc after sending
diff --git a/src/common/socket.h b/src/common/socket.h
index 2c0412a9e..9552575f3 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -67,8 +67,6 @@ extern time_t stall_time;
 #define WFIFOL(fd,pos) (*(unsigned long*)WFIFOP(fd,pos))
 // use function instead of macro.
 //#define WFIFOSET(fd,len) (session[fd]->wdata_size = (session[fd]->wdata_size + (len) + 2048 < session[fd]->max_wdata) ? session[fd]->wdata_size + len : session[fd]->wdata_size)
-#define WFIFOSET(fd,len)        _WFIFOSET(fd,len,0)
-#define WFIFOSET2(fd,len,flush) _WFIFOSET(fd,len,flush)
 #define WBUFP(p,pos) (((unsigned char*)(p)) + (pos))
 #define WBUFB(p,pos) (*(unsigned char*)((p) + (pos)))
 #define WBUFW(p,pos) (*(unsigned short*)((p) + (pos)))
@@ -151,7 +149,7 @@ int make_connection(long,int);
 int delete_session(int);
 int realloc_fifo(int fd,unsigned int rfifo_size,unsigned int wfifo_size);
 int realloc_writefifo(int fd, size_t addition);
-int _WFIFOSET(int fd,int len,char flush);
+int WFIFOSET(int fd,int len);
 int RFIFOSKIP(int fd,int len);
 
 int do_sendrecv(int next);