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

Merge remote branch 'origin/master' into 330

Browse source
This commit is contained in:
tomrus88 2010-03-28 04:32:10 +04:00
commit 7b1e8cae76
13 changed files with 80 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/game/World.cpp
View file

@ -1961,7 +1961,7 @@ void World::LoadDBVersion()
m_CreatureEventAIVersion = "Unknown creature EventAI.";
}
void World::setConfig(eConfigUint32Values index, char const* fieldname, uint32 defvalue)
void World::setConfig(eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
{
setConfig(index, sConfig.GetIntDefault(fieldname,defvalue));
}
@ -1971,7 +1971,7 @@ void World::setConfig(eConfigInt32Values index, char const* fieldname, int32 def
setConfig(index, sConfig.GetIntDefault(fieldname,defvalue));
}
void World::setConfig(eConfigFLoatValues index, char const* fieldname, float defvalue)
void World::setConfig(eConfigFloatValues index, char const* fieldname, float defvalue)
{
setConfig(index, sConfig.GetFloatDefault(fieldname,defvalue));
}
@ -1981,7 +1981,7 @@ void World::setConfig( eConfigBoolValues index, char const* fieldname, bool defv
setConfig(index, sConfig.GetBoolDefault(fieldname,defvalue));
}
void World::setConfigPos(eConfigUint32Values index, char const* fieldname, uint32 defvalue)
void World::setConfigPos(eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
{
setConfig(index, fieldname, defvalue);
if (int32(getConfig(index)) < 0)
@ -1991,7 +1991,7 @@ void World::setConfigPos(eConfigUint32Values index, char const* fieldname, uint3
}
}
void World::setConfigPos(eConfigFLoatValues index, char const* fieldname, float defvalue)
void World::setConfigPos(eConfigFloatValues index, char const* fieldname, float defvalue)
{
setConfig(index, fieldname, defvalue);
if (getConfig(index) < 0.0f)
@ -2001,7 +2001,7 @@ void World::setConfigPos(eConfigFLoatValues index, char const* fieldname, float
}
}
void World::setConfigMin(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue)
void World::setConfigMin(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue)
{
setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue)
@ -2021,7 +2021,7 @@ void World::setConfigMin(eConfigInt32Values index, char const* fieldname, int32
}
}
void World::setConfigMin(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue)
void World::setConfigMin(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue)
{
setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue)
@ -2031,7 +2031,7 @@ void World::setConfigMin(eConfigFLoatValues index, char const* fieldname, float
}
}
void World::setConfigMinMax(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue)
void World::setConfigMinMax(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue)
{
setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue)
@ -2061,7 +2061,7 @@ void World::setConfigMinMax(eConfigInt32Values index, char const* fieldname, int
}
}
void World::setConfigMinMax(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue)
void World::setConfigMinMax(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue)
{
setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue)
@ -2076,7 +2076,7 @@ void World::setConfigMinMax(eConfigFLoatValues index, char const* fieldname, flo
}
}
bool World::configNoReload(bool reload, eConfigUint32Values index, char const* fieldname, uint32 defvalue)
bool World::configNoReload(bool reload, eConfigUInt32Values index, char const* fieldname, uint32 defvalue)
{
if (!reload)
return true;
@ -2100,7 +2100,7 @@ bool World::configNoReload(bool reload, eConfigInt32Values index, char const* fi
return false;
}
bool World::configNoReload(bool reload, eConfigFLoatValues index, char const* fieldname, float defvalue)
bool World::configNoReload(bool reload, eConfigFloatValues index, char const* fieldname, float defvalue)
{
if (!reload)
return true;