Explorar o código

Resolved some compile warnings
* Fixes #2588.
* Clean up from 24b3509.
Thanks to @darhlism!

aleos89 %!s(int64=7) %!d(string=hai) anos
pai
achega
c13f271a94
Modificáronse 4 ficheiros con 4 adicións e 4 borrados
  1. 1 1
      src/char/char_mapif.cpp
  2. 1 1
      src/char/int_guild.cpp
  3. 1 1
      src/char/inter.cpp
  4. 1 1
      src/char/inter.hpp

+ 1 - 1
src/char/char_mapif.cpp

@@ -1028,7 +1028,7 @@ int chmapif_parse_reqauth(int fd, int id){
 		login_id1  = RFIFOL(fd,10);
 		sex        = RFIFOB(fd,14);
 		ip         = ntohl(RFIFOL(fd,15));
-		autotrade  = RFIFOB(fd,19);
+		autotrade  = RFIFOB(fd,19) != 0;
 		RFIFOSKIP(fd,20);
 
 		node = (struct auth_node*)idb_get(auth_db, account_id);

+ 1 - 1
src/char/int_guild.cpp

@@ -732,7 +732,7 @@ int inter_guild_sql_init(void)
 
 	//Read exp file
 	for(i = 0; i<ARRAYLENGTH(filename); i++){
-		sv_readdb(db_path, filename[i], ',', 1, 1, 100, exp_guild_parse_row, i);
+		sv_readdb(db_path, filename[i], ',', 1, 1, 100, exp_guild_parse_row, i > 0);
 	}
 
 	add_timer_func_list(guild_save_timer, "guild_save_timer");

+ 1 - 1
src/char/inter.cpp

@@ -822,7 +822,7 @@ int inter_config_read(const char* cfgName)
 }
 
 // Save interlog into sql
-int inter_log(char* fmt, ...)
+int inter_log(const char* fmt, ...)
 {
 	char str[255];
 	char esc_str[sizeof(str)*2+1];// escaped str

+ 1 - 1
src/char/inter.hpp

@@ -28,7 +28,7 @@ void mapif_accinfo_ack(bool success, int map_fd, int u_fd, int u_aid, int accoun
 	int group_id, int logincount, int state, const char *email, const char *last_ip, const char *lastlogin,
 	const char *birthdate, const char *user_pass, const char *pincode, const char *userid);
 
-int inter_log(char *fmt,...);
+int inter_log(const char *fmt,...);
 
 #define inter_cfgName "conf/inter_athena.conf"