From c13f271a941454602a2581e844cf6ee897bbecd0 Mon Sep 17 00:00:00 2001 From: aleos89 Date: Wed, 8 Nov 2017 13:36:01 -0500 Subject: [PATCH] Resolved some compile warnings * Fixes #2588. * Clean up from 24b3509. Thanks to @darhlism! --- src/char/char_mapif.cpp | 2 +- src/char/int_guild.cpp | 2 +- src/char/inter.cpp | 2 +- src/char/inter.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/char/char_mapif.cpp b/src/char/char_mapif.cpp index 3ead85fe72..52044fd460 100644 --- a/src/char/char_mapif.cpp +++ b/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); diff --git a/src/char/int_guild.cpp b/src/char/int_guild.cpp index c1b57100c3..600553836f 100644 --- a/src/char/int_guild.cpp +++ b/src/char/int_guild.cpp @@ -732,7 +732,7 @@ int inter_guild_sql_init(void) //Read exp file for(i = 0; i 0); } add_timer_func_list(guild_save_timer, "guild_save_timer"); diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 85da86063e..15023f1940 100644 --- a/src/char/inter.cpp +++ b/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 diff --git a/src/char/inter.hpp b/src/char/inter.hpp index 4b5ea899dc..d45e560866 100644 --- a/src/char/inter.hpp +++ b/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"