diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 5ecc392..3fa6191 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -88,6 +88,11 @@ void Guild::MarkDirty() } } +void Guild::Deserialize(const std::string& guild_data, const std::string& guild_log) +{ + +} + void Guild::_CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg) { cs::SMGuildInfo respmsg; diff --git a/server/imserver/guild.h b/server/imserver/guild.h index 76c13fe..62c7474 100644 --- a/server/imserver/guild.h +++ b/server/imserver/guild.h @@ -63,6 +63,7 @@ class Guild void Init(); void UnInit(); void MarkDirty(); + void Deserialize(const std::string& guild_data, const std::string& guild_log); void _CMGuildInfo(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildInfo& msg); void _CMGuildJoin(int socket_handle, const ss::MFIMMsgConext& context, const cs::CMGuildJoin& msg); diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc index d621e70..d82211e 100644 --- a/server/imserver/guildmgr.cc +++ b/server/imserver/guildmgr.cc @@ -438,7 +438,6 @@ void GuildMgr::CreateGuild(int gameid, guild->guild_status = guild_status; guild->createtime = createtime; //guild_members - //guild_data - //guild_log + guild->Deserialize(guild_data, guild_log); id_hash_[guild_id] = guild; }