4 files changed, 6 insertions, 5 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index a041d9957..11ce53ae7 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -1245,7 +1245,7 @@ int chrif_parse(int fd)
 		return 0;
 	}
 
-	if (session[fd]->eof)
+	if (session[fd]->flag.eof)
 	{
 		if (chrif_connected == 1)
 			chrif_disconnect(fd);
@@ -1393,7 +1393,7 @@ int check_connect_char_server(int tid, unsigned int tick, int id, int data)
 		}
 
 		session[char_fd]->func_parse = chrif_parse;
-		session[char_fd]->client_addr = 0;
+		session[char_fd]->flag.server = 1;
 		realloc_fifo(char_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 
 		chrif_connect(char_fd);
diff --git a/src/map/clif.c b/src/map/clif.c
index 6a7017d5f..957154a3d 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -11494,7 +11494,7 @@ int clif_parse(int fd)
 	{ // begin main client packet processing loop
 
 	sd = (TBL_PC *)session[fd]->session_data;
-	if (session[fd]->eof) {
+	if (session[fd]->flag.eof) {
 		if (sd) {
 			if (sd->state.autotrade) {
 				//Disassociate character from the socket connection.
diff --git a/src/map/guild.c b/src/map/guild.c
index ac5f67fa8..1e90226dc 100644
--- a/src/map/guild.c
+++ b/src/map/guild.c
@@ -233,7 +233,7 @@ struct guild_castle* guild_castle_search(int gcid)
 struct guild_castle* guild_mapindex2gc(short mapindex)
 {
 	struct guild_castle* gc;
-	
+
 	DBIterator* iter = castle_db->iterator(castle_db);
 	for( gc = iter->first(iter,NULL); iter->exists(iter); gc = iter->next(iter,NULL) )
 	{
@@ -277,6 +277,7 @@ int guild_getindex(struct guild *g,int account_id,int char_id)
 int guild_getposition(struct guild* g, struct map_session_data* sd)
 {
 	int i;
+
 	if( g == NULL && (g=guild_search(sd->status.guild_id)) == NULL )
 		return -1;
 	
diff --git a/src/map/irc.c b/src/map/irc.c
index a7995e615..67d269e51 100644
--- a/src/map/irc.c
+++ b/src/map/irc.c
@@ -121,7 +121,7 @@ void irc_announce_mvp(struct map_session_data *sd, struct mob_data *md)
 
 int irc_parse(int fd)
 {
-	if (session[fd]->eof)
+	if (session[fd]->flag.eof)
 	{
 		do_close(fd);
 		irc_si = NULL;