Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -1,4 +1,4 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or modify
@ -19,7 +19,7 @@
#include "Config.h"
#include "ace/Configuration_Import_Export.h"
#include "Policies/SingletonImp.h"
#include "Policies/Singleton.h"
INSTANTIATE_SINGLETON_1(Config);
@ -99,14 +99,12 @@ bool Config::GetBoolDefault(const char* name, bool def)
return false;
}
int32 Config::GetIntDefault(const char* name, int32 def)
{
ACE_TString val;
return GetValueHelper(mConf, name, val) ? atoi(val.c_str()) : def;
}
float Config::GetFloatDefault(const char* name, float def)
{
ACE_TString val;

View file

@ -1,4 +1,4 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or modify