mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 10:37:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9050] Add MAX_EXPANSION define for config option Expansion check.

Browse source 
This will prevent case when expansion set to high for supported client
in config and account have also too high expansion setting.
Client in like case receive too high expnasion and reject connection
because it think that have not installed expansion for connection account.

This possible for example for account case when single realmd used for
diff client versions and account have high expansion setting for most
recent client support. And in same time mamngos.conf for specific realm
have wrong Expansion value.
This commit is contained in:
VladimirMangos 2009-12-23 20:16:47 +03:00
parent 5e081196b1
commit fb21f4c16e
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/game/SharedDefines.h
View file

@ -2646,4 +2646,11 @@ enum PetTameFailureReason
#define EXPECTED_MANGOSD_CLIENT_BUILD {10505, 0}
// max supported expansion level in mangosd
// NOTE: not set it more that supported by targeted client version with all expansions installed
// account with expansion > client supported will rejected at connection by client
// because if client receive unsupported expansion level it think
// that it not have expansion installed and reject
#define MAX_EXPANSION 2
#endif

10
src/game/World.cpp
View file

@ -897,12 +897,18 @@ void World::LoadConfigSettings(bool reload)
if(reload)
{
uint32 val = sConfig.GetIntDefault("Expansion",1);
uint32 val = sConfig.GetIntDefault("Expansion",MAX_EXPANSION);
if(val!=m_configs[CONFIG_EXPANSION])
sLog.outError("Expansion option can't be changed at mangosd.conf reload, using current value (%u).",m_configs[CONFIG_EXPANSION]);
}
else
m_configs[CONFIG_EXPANSION] = sConfig.GetIntDefault("Expansion",1);
m_configs[CONFIG_EXPANSION] = sConfig.GetIntDefault("Expansion",MAX_EXPANSION);
if(m_configs[CONFIG_EXPANSION] > MAX_EXPANSION)
{
sLog.outError("Expansion option can't be greater %u but set to %u, used %u",MAX_EXPANSION,m_configs[CONFIG_EXPANSION],MAX_EXPANSION);
m_configs[CONFIG_EXPANSION] = MAX_EXPANSION;
}
m_configs[CONFIG_CHATFLOOD_MESSAGE_COUNT] = sConfig.GetIntDefault("ChatFlood.MessageCount",10);
m_configs[CONFIG_CHATFLOOD_MESSAGE_DELAY] = sConfig.GetIntDefault("ChatFlood.MessageDelay",1);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9049"
#define REVISION_NR "9050"
#endif // __REVISION_NR_H__