mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 01:37:00 +00:00
[7174] Implement new option GM.Visible for set original GM visibility state at login.
Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
parent
939ef7612d
commit
4e72f3bb33
5 changed files with 21 additions and 1 deletions
|
|
@ -14535,6 +14535,17 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder )
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch(sWorld.getConfig(CONFIG_GM_VISIBLE_STATE))
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
case 0: SetGMVisible(false); break; // invisible
|
||||||
|
case 1: break; // visible
|
||||||
|
case 2: // save state
|
||||||
|
if(extraflags & PLAYER_EXTRA_GM_INVISIBLE)
|
||||||
|
SetGMVisible(false);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
switch(sWorld.getConfig(CONFIG_GM_ACCEPT_TICKETS))
|
switch(sWorld.getConfig(CONFIG_GM_ACCEPT_TICKETS))
|
||||||
{
|
{
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -778,6 +778,7 @@ void World::LoadConfigSettings(bool reload)
|
||||||
}
|
}
|
||||||
|
|
||||||
m_configs[CONFIG_GM_LOGIN_STATE] = sConfig.GetIntDefault("GM.LoginState", 2);
|
m_configs[CONFIG_GM_LOGIN_STATE] = sConfig.GetIntDefault("GM.LoginState", 2);
|
||||||
|
m_configs[CONFIG_GM_VISIBLE_STATE] = sConfig.GetIntDefault("GM.Visible", 2);
|
||||||
m_configs[CONFIG_GM_ACCEPT_TICKETS] = sConfig.GetIntDefault("GM.AcceptTickets", 2);
|
m_configs[CONFIG_GM_ACCEPT_TICKETS] = sConfig.GetIntDefault("GM.AcceptTickets", 2);
|
||||||
m_configs[CONFIG_GM_CHAT] = sConfig.GetIntDefault("GM.Chat", 2);
|
m_configs[CONFIG_GM_CHAT] = sConfig.GetIntDefault("GM.Chat", 2);
|
||||||
m_configs[CONFIG_GM_WISPERING_TO] = sConfig.GetIntDefault("GM.WhisperingTo", 2);
|
m_configs[CONFIG_GM_WISPERING_TO] = sConfig.GetIntDefault("GM.WhisperingTo", 2);
|
||||||
|
|
|
||||||
|
|
@ -122,6 +122,7 @@ enum WorldConfigs
|
||||||
CONFIG_MAX_PRIMARY_TRADE_SKILL,
|
CONFIG_MAX_PRIMARY_TRADE_SKILL,
|
||||||
CONFIG_MIN_PETITION_SIGNS,
|
CONFIG_MIN_PETITION_SIGNS,
|
||||||
CONFIG_GM_LOGIN_STATE,
|
CONFIG_GM_LOGIN_STATE,
|
||||||
|
CONFIG_GM_VISIBLE_STATE,
|
||||||
CONFIG_GM_ACCEPT_TICKETS,
|
CONFIG_GM_ACCEPT_TICKETS,
|
||||||
CONFIG_GM_CHAT,
|
CONFIG_GM_CHAT,
|
||||||
CONFIG_GM_WISPERING_TO,
|
CONFIG_GM_WISPERING_TO,
|
||||||
|
|
|
||||||
|
|
@ -833,6 +833,12 @@ Channel.SilentlyGMJoin = 0
|
||||||
# 0 (disable)
|
# 0 (disable)
|
||||||
# 1 (enable)
|
# 1 (enable)
|
||||||
#
|
#
|
||||||
|
# GM.Visible
|
||||||
|
# GM visibility at login
|
||||||
|
# Default: 2 (last save state)
|
||||||
|
# 0 (invisible)
|
||||||
|
# 1 (visible)
|
||||||
|
#
|
||||||
# GM.AcceptTickets
|
# GM.AcceptTickets
|
||||||
# Is GM accepting tickets from player by default or not.
|
# Is GM accepting tickets from player by default or not.
|
||||||
# Default: 2 (last save state)
|
# Default: 2 (last save state)
|
||||||
|
|
@ -883,6 +889,7 @@ Channel.SilentlyGMJoin = 0
|
||||||
###################################################################################################################
|
###################################################################################################################
|
||||||
|
|
||||||
GM.LoginState = 2
|
GM.LoginState = 2
|
||||||
|
GM.Visible = 2
|
||||||
GM.AcceptTickets = 2
|
GM.AcceptTickets = 2
|
||||||
GM.Chat = 2
|
GM.Chat = 2
|
||||||
GM.WhisperingTo = 2
|
GM.WhisperingTo = 2
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7173"
|
#define REVISION_NR "7174"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue