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

[9631] Fix enum names.

Browse source 
Signed-off-by: AlexDereka <dereka.alex@gmail.com>
This commit is contained in:
Zor 2010-03-27 22:11:10 +03:00 • committed by AlexDereka
parent 0150f48b52
commit 7b180e5fa8
5 changed files with 34 additions and 34 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."; 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)); 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)); 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)); 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)); 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); setConfig(index, fieldname, defvalue);
if (int32(getConfig(index)) < 0) 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); setConfig(index, fieldname, defvalue);
if (getConfig(index) < 0.0f) 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); setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue) 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); setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue) 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); setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue) 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); setConfig(index, fieldname, defvalue);
if (getConfig(index) < minvalue) 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) if (!reload)
return true; return true;
@ -2100,7 +2100,7 @@ bool World::configNoReload(bool reload, eConfigInt32Values index, char const* fi
return false; 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) if (!reload)
return true; return true;

40
src/game/World.h
View file

@ -81,7 +81,7 @@ enum WorldTimers
}; };
/// Configuration elements /// Configuration elements
enum eConfigUint32Values enum eConfigUInt32Values
{ {
CONFIG_UINT32_COMPRESSION = 0, CONFIG_UINT32_COMPRESSION = 0,
CONFIG_UINT32_INTERVAL_SAVE, CONFIG_UINT32_INTERVAL_SAVE,
@ -184,7 +184,7 @@ enum eConfigInt32Values
}; };
/// Server config /// Server config
enum eConfigFLoatValues enum eConfigFloatValues
{ {
CONFIG_FLOAT_RATE_HEALTH = 0, CONFIG_FLOAT_RATE_HEALTH = 0,
CONFIG_FLOAT_RATE_POWER_MANA, CONFIG_FLOAT_RATE_POWER_MANA,
@ -491,15 +491,15 @@ class World
void UpdateSessions( uint32 diff ); void UpdateSessions( uint32 diff );
/// et a server configuration element (see #eConfigFLoatValues) /// et a server configuration element (see #eConfigFloatValues)
void setConfig(eConfigFLoatValues index,float value) { m_configFloatValues[index]=value; } void setConfig(eConfigFloatValues index,float value) { m_configFloatValues[index]=value; }
/// Get a server configuration element (see #eConfigFLoatValues) /// Get a server configuration element (see #eConfigFloatValues)
float getConfig(eConfigFLoatValues rate) const { return m_configFloatValues[rate]; } float getConfig(eConfigFloatValues rate) const { return m_configFloatValues[rate]; }
/// Set a server configuration element (see #eConfigUint32Values) /// Set a server configuration element (see #eConfigUInt32Values)
void setConfig(eConfigUint32Values index, uint32 value) { m_configUint32Values[index]=value; } void setConfig(eConfigUInt32Values index, uint32 value) { m_configUint32Values[index]=value; }
/// Get a server configuration element (see #eConfigUint32Values) /// Get a server configuration element (see #eConfigUInt32Values)
uint32 getConfig(eConfigUint32Values index) const { return m_configUint32Values[index]; } uint32 getConfig(eConfigUInt32Values index) const { return m_configUint32Values[index]; }
/// Set a server configuration element (see #eConfigInt32Values) /// Set a server configuration element (see #eConfigInt32Values)
void setConfig(eConfigInt32Values index, int32 value) { m_configInt32Values[index]=value; } void setConfig(eConfigInt32Values index, int32 value) { m_configInt32Values[index]=value; }
@ -562,21 +562,21 @@ class World
void InitDailyQuestResetTime(); void InitDailyQuestResetTime();
void ResetDailyQuests(); void ResetDailyQuests();
private: private:
void setConfig(eConfigUint32Values index, char const* fieldname, uint32 defvalue); void setConfig(eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
void setConfig(eConfigInt32Values index, char const* fieldname, int32 defvalue); void setConfig(eConfigInt32Values index, char const* fieldname, int32 defvalue);
void setConfig(eConfigFLoatValues index, char const* fieldname, float defvalue); void setConfig(eConfigFloatValues index, char const* fieldname, float defvalue);
void setConfig(eConfigBoolValues index, char const* fieldname, bool defvalue); void setConfig(eConfigBoolValues index, char const* fieldname, bool defvalue);
void setConfigPos(eConfigUint32Values index, char const* fieldname, uint32 defvalue); void setConfigPos(eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
void setConfigPos(eConfigFLoatValues index, char const* fieldname, float defvalue); void setConfigPos(eConfigFloatValues index, char const* fieldname, float defvalue);
void setConfigMin(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue); void setConfigMin(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue);
void setConfigMin(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue); void setConfigMin(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue);
void setConfigMin(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue); void setConfigMin(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue);
void setConfigMinMax(eConfigUint32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue); void setConfigMinMax(eConfigUInt32Values index, char const* fieldname, uint32 defvalue, uint32 minvalue, uint32 maxvalue);
void setConfigMinMax(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue, int32 maxvalue); void setConfigMinMax(eConfigInt32Values index, char const* fieldname, int32 defvalue, int32 minvalue, int32 maxvalue);
void setConfigMinMax(eConfigFLoatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue); void setConfigMinMax(eConfigFloatValues index, char const* fieldname, float defvalue, float minvalue, float maxvalue);
bool configNoReload(bool reload, eConfigUint32Values index, char const* fieldname, uint32 defvalue); bool configNoReload(bool reload, eConfigUInt32Values index, char const* fieldname, uint32 defvalue);
bool configNoReload(bool reload, eConfigInt32Values index, char const* fieldname, int32 defvalue); bool configNoReload(bool reload, eConfigInt32Values index, char const* fieldname, int32 defvalue);
bool configNoReload(bool reload, eConfigFLoatValues index, char const* fieldname, float defvalue); bool configNoReload(bool reload, eConfigFloatValues index, char const* fieldname, float defvalue);
bool configNoReload(bool reload, eConfigBoolValues index, char const* fieldname, bool defvalue); bool configNoReload(bool reload, eConfigBoolValues index, char const* fieldname, bool defvalue);
static volatile bool m_stopEvent; static volatile bool m_stopEvent;

2
src/game/WorldSocket.cpp
View file

@ -687,7 +687,7 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
return HandleAuthSession (*new_pct); return HandleAuthSession (*new_pct);
case CMSG_KEEP_ALIVE: case CMSG_KEEP_ALIVE:
DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: %d", new_pct->size ()); DEBUG_LOG ("CMSG_KEEP_ALIVE ,size: "SIZEFMTD" ", new_pct->size ());
return 0; return 0;
default: default:

4
src/realmd/AuthSocket.cpp
View file

@ -276,11 +276,11 @@ void AuthSocket::OnRead()
(table[i].status == STATUS_CONNECTED || (table[i].status == STATUS_CONNECTED ||
(_authed && table[i].status == STATUS_AUTHED))) (_authed && table[i].status == STATUS_AUTHED)))
{ {
DEBUG_LOG("[Auth] got data for cmd %u ibuf length %u", (uint32)_cmd, ibuf.GetLength()); DEBUG_LOG("[Auth] got data for cmd %u ibuf length "SIZEFMTD" ", (uint32)_cmd, ibuf.GetLength());
if (!(*this.*table[i].handler)()) if (!(*this.*table[i].handler)())
{ {
DEBUG_LOG("Command handler failed for cmd %u ibuf length %u", (uint32)_cmd, ibuf.GetLength()); DEBUG_LOG("Command handler failed for cmd %u ibuf length "SIZEFMTD" ", (uint32)_cmd, ibuf.GetLength());
return; return;
} }
break; break;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9630" #define REVISION_NR "9631"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__