1
This commit is contained in:
parent
ce5e659264
commit
17ec97e887
@ -49,7 +49,7 @@ public:
|
||||
hdr.user_data = &forward_msg;
|
||||
if (guild->Status() == kGuildDismissed) {
|
||||
cs::SMShowErrorMsg notifymsg;
|
||||
notifymsg.set_msg(TEXT("guild_dismissed", "dismissed"));
|
||||
notifymsg.set_msg(TEXT("guild_dismissed", "force dismissed"));
|
||||
GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
|
||||
forward_msg.context(),
|
||||
notifymsg);
|
||||
@ -287,10 +287,9 @@ void GuildMgr::LoadGuild(long long guild_id)
|
||||
" join_unlimited, join_cond1, join_cond2, createtime, channel, "
|
||||
" owner_vip_lv, owner_head, creator_vip_lv, creator_head, "
|
||||
" owner_sex, creator_sex "
|
||||
"FROM `guild` WHERE guild_id=%d AND guild_status <> %d;",
|
||||
"FROM `guild` WHERE guild_id=%d;",
|
||||
{
|
||||
guild_id,
|
||||
kGuildDismissed
|
||||
guild_id
|
||||
},
|
||||
a8::XParams()
|
||||
.SetSender(guild_id),
|
||||
|
@ -13,6 +13,13 @@ enum InnerMesssage_e
|
||||
IM_HttpResponse,
|
||||
};
|
||||
|
||||
enum GuildStatus_e
|
||||
{
|
||||
kGuildCreatePending = 0,
|
||||
kGuildCreated = 1,
|
||||
kGuildDismissed = 2
|
||||
};
|
||||
|
||||
//网络处理对象
|
||||
enum NetHandler_e
|
||||
{
|
||||
|
@ -800,7 +800,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
|
||||
guild->_gameid(),
|
||||
rank_cmp_func_,
|
||||
MAX_RANK_LIST_NUM);
|
||||
if (guild->_guild_status() == 2 ||
|
||||
if (guild->_guild_status() == kGuildDismissed ||
|
||||
guild->member_num() <= 0) {
|
||||
rank_list->Remove(guild);
|
||||
} else {
|
||||
@ -814,7 +814,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
|
||||
guild->_gameid(),
|
||||
sorted_cmp_func_,
|
||||
MAX_SORTED_LIST_NUM);
|
||||
if (guild->_guild_status() == 2 ||
|
||||
if (guild->_guild_status() == kGuildDismissed ||
|
||||
guild->member_num() <= 0) {
|
||||
rank_list->Remove(guild);
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user