1 files changed, 37 insertions, 12 deletions

diff --git a/src/char/char.c b/src/char/char.c
index 18269aeaf..a09eccd8a 100644
--- a/src/char/char.c
+++ b/src/char/char.c
@@ -1548,9 +1548,20 @@ static int char_rename_char_sql(struct char_session_data *sd, int char_id)
 	// log change
 	if (chr->enable_logs) {
 		if (SQL_ERROR == SQL->Query(inter->sql_handle,
-					"INSERT INTO `%s` (`time`, `char_msg`,`account_id`,`char_id`,`char_num`,`name`,`str`,`agi`,`vit`,`int`,`dex`,`luk`,`hair`,`hair_color`)"
-					"VALUES (NOW(), '%s', '%d', '%d', '%d', '%s', '0', '0', '0', '0', '0', '0', '0', '0')",
-					charlog_db, "change char name", sd->account_id, char_dat.char_id, char_dat.slot, esc_name))
+					"INSERT INTO `%s` ("
+					" `time`, `char_msg`, `account_id`, `char_id`, `char_num`, `class`, `name`,"
+					" `str`, `agi`, `vit`, `int`, `dex`, `luk`,"
+					" `hair`, `hair_color`"
+					") VALUES ("
+					" NOW(), 'change char name', '%d', '%d', '%d', '%d', '%s',"
+					" '%d', '%d', '%d', '%d', '%d', '%d',"
+					" '%d', '%d'"
+					")",
+					charlog_db,
+					sd->account_id, char_dat.char_id, char_dat.slot, char_dat.class, esc_name,
+					char_dat.str, char_dat.agi, char_dat.vit, char_dat.int_, char_dat.dex, char_dat.luk,
+					char_dat.hair, char_dat.hair_color
+					))
 			Sql_ShowDebug(inter->sql_handle);
 	}
 
@@ -4353,9 +4364,9 @@ static void char_delete2_cancel(int fd, struct char_session_data *sd)
 
 static void char_send_account_id(int fd, int account_id)
 {
-	WFIFOHEAD(fd,4);
-	WFIFOL(fd,0) = account_id;
-	WFIFOSET(fd,4);
+	WFIFOHEAD(fd, 4);
+	WFIFOL(fd, 0) = account_id;
+	WFIFOSET2(fd, 4);
 }
 
 static void char_parse_char_connect(int fd, struct char_session_data *sd, uint32 ipl)
@@ -4566,8 +4577,19 @@ static void char_parse_char_select(int fd, struct char_session_data *sd, uint32
 		// FIXME: Why are we re-escaping the name if it was already escaped in rename/make_new_char? [Panikon]
 		SQL->EscapeStringLen(inter->sql_handle, esc_name, char_dat.name, strnlen(char_dat.name, NAME_LENGTH));
 		if (SQL_ERROR == SQL->Query(inter->sql_handle,
-					"INSERT INTO `%s`(`time`, `account_id`, `char_id`, `char_num`, `name`) VALUES (NOW(), '%d', '%d', '%d', '%s')",
-					charlog_db, sd->account_id, cd->char_id, slot, esc_name))
+					"INSERT INTO `%s`("
+					" `time`, `char_msg`, `account_id`, `char_id`, `char_num`, `class`, `name`,"
+					" `str`, `agi`, `vit`, `int`, `dex`, `luk`,"
+					" `hair`, `hair_color`"
+					") VALUES ("
+					" NOW(), 'char select', '%d', '%d', '%d', '%d', '%s',"
+					" '%d', '%d', '%d', '%d', '%d', '%d',"
+					" '%d', '%d')",
+					charlog_db,
+					sd->account_id, cd->char_id, slot, char_dat.class, esc_name,
+					char_dat.str, char_dat.agi, char_dat.vit, char_dat.int_, char_dat.dex, char_dat.luk,
+					char_dat.hair, char_dat.hair_color
+					))
 			Sql_ShowDebug(inter->sql_handle);
 	}
 	ShowInfo("Selected char: (Account %d: %d - %s)\n", sd->account_id, slot, char_dat.name);
@@ -4908,10 +4930,10 @@ static void char_parse_char_delete2_cancel(int fd, struct char_session_data *sd)
 // 3 - error
 static void char_login_map_server_ack(int fd, uint8 flag)
 {
-	WFIFOHEAD(fd,3);
-	WFIFOW(fd,0) = 0x2af9;
-	WFIFOB(fd,2) = flag;
-	WFIFOSET(fd,3);
+	WFIFOHEAD(fd, 3);
+	WFIFOW(fd, 0) = 0x2af9;
+	WFIFOB(fd, 2) = flag;
+	WFIFOSET2(fd, 3);
 }
 
 static void char_parse_char_login_map_server(int fd, uint32 ipl)
@@ -4938,6 +4960,7 @@ static void char_parse_char_login_map_server(int fd, uint32 ipl)
 		chr->server[i].users = 0;
 		sockt->session[fd]->func_parse = chr->parse_frommap;
 		sockt->session[fd]->flag.server = 1;
+		sockt->session[fd]->flag.validate = 0;
 		sockt->realloc_fifo(fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 		chr->mapif_init(fd);
 	}
@@ -5307,6 +5330,7 @@ static int char_check_connect_login_server(int tid, int64 tick, int id, intptr_t
 
 	sockt->session[chr->login_fd]->func_parse = chr->parse_fromlogin;
 	sockt->session[chr->login_fd]->flag.server = 1;
+	sockt->session[chr->login_fd]->flag.validate = 0;
 	sockt->realloc_fifo(chr->login_fd, FIFOSIZE_SERVERLINK, FIFOSIZE_SERVERLINK);
 
 	loginif->connect_to_server();
@@ -6299,6 +6323,7 @@ int do_init(int argc, char **argv)
 		Sql_ShowDebug(inter->sql_handle);
 
 	sockt->set_defaultparse(chr->parse_char);
+	sockt->validate = true;
 
 	if ((chr->char_fd = sockt->make_listen_bind(bind_ip,chr->port)) == -1) {
 		ShowFatalError("Failed to bind to port '"CL_WHITE"%d"CL_RESET"'\n",chr->port);