summaryrefslogtreecommitdiffstats
path: root/src/Scoreboard.h
diff options
context:
space:
mode:
authorandrew <xdotftw@gmail.com>2014-03-01 13:20:29 +0100
committerandrew <xdotftw@gmail.com>2014-03-01 13:20:29 +0100
commit692a84af31889af7a83b780009b1fcc81bfa3d99 (patch)
treeaafc6ace2e30ff55b082cbcef306c23d8b0a4b68 /src/Scoreboard.h
parentExported cScoreboard::ForEachObjective (diff)
downloadcuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar.gz
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar.bz2
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar.lz
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar.xz
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.tar.zst
cuberite-692a84af31889af7a83b780009b1fcc81bfa3d99.zip
Diffstat (limited to '')
-rw-r--r--src/Scoreboard.h36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/Scoreboard.h b/src/Scoreboard.h
index 8e268516d..2abd1564b 100644
--- a/src/Scoreboard.h
+++ b/src/Scoreboard.h
@@ -31,23 +31,23 @@ public:
enum eType
{
- E_TYPE_DUMMY,
+ otDummy,
- E_TYPE_DEATH_COUNT,
- E_TYPE_PLAYER_KILL_COUNT,
- E_TYPE_TOTAL_KILL_COUNT,
- E_TYPE_HEALTH,
+ otDeathCount,
+ otPlayerKillCount,
+ otTotalKillCount,
+ otHealth,
- E_TYPE_ACHIEVEMENT,
+ otAchievement,
- E_TYPE_STAT,
- E_TYPE_STAT_ITEM_CRAFT,
- E_TYPE_STAT_ITEM_USE,
- E_TYPE_STAT_ITEM_BREAK,
+ otStat,
+ otStatItemCraft,
+ otStatItemUse,
+ otStatItemBreak,
- E_TYPE_STAT_BLOCK_MINE,
- E_TYPE_STAT_ENTITY_KILL,
- E_TYPE_STAT_ENTITY_KILLED_BY
+ otStatBlockMine,
+ otStatEntityKill,
+ otStatEntityKilledBy
};
// tolua_end
@@ -201,11 +201,11 @@ public:
enum eDisplaySlot
{
- E_DISPLAY_SLOT_LIST = 0,
- E_DISPLAY_SLOT_SIDEBAR,
- E_DISPLAY_SLOT_NAME,
+ dsList = 0,
+ dsSidebar,
+ dsName,
- E_DISPLAY_SLOT_COUNT
+ dsCount
};
// tolua_end
@@ -284,7 +284,7 @@ private:
cWorld * m_World;
- cObjective* m_Display[E_DISPLAY_SLOT_COUNT];
+ cObjective * m_Display[dsCount];
friend class cScoreboardSerializer;