diff options
| author | Mattes D <github@xoft.cz> | 2014-03-01 15:20:30 +0100 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-03-01 15:20:30 +0100 |
| commit | 80b0496bff3d8b8c65fd79a183a665d7cad396c8 (patch) | |
| tree | 535474f8e8eb226546a4ad921ab76c7ca340b226 /src/WorldStorage/ScoreboardSerializer.cpp | |
| parent | Merge pull request #737 from mc-server/InfoDump_SourceLocation (diff) | |
| parent | APIDump: Fixed cScoreboard enums (diff) | |
| download | cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar.gz cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar.bz2 cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar.lz cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar.xz cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.tar.zst cuberite-80b0496bff3d8b8c65fd79a183a665d7cad396c8.zip | |
Diffstat (limited to 'src/WorldStorage/ScoreboardSerializer.cpp')
| -rw-r--r-- | src/WorldStorage/ScoreboardSerializer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/WorldStorage/ScoreboardSerializer.cpp b/src/WorldStorage/ScoreboardSerializer.cpp index 9b8b661c4..6c885bb45 100644 --- a/src/WorldStorage/ScoreboardSerializer.cpp +++ b/src/WorldStorage/ScoreboardSerializer.cpp @@ -173,13 +173,13 @@ void cScoreboardSerializer::SaveScoreboardToNBT(cFastNBTWriter & a_Writer) a_Writer.BeginCompound("DisplaySlots"); - cObjective * Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::E_DISPLAY_SLOT_LIST); + cObjective * Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::dsList); a_Writer.AddString("slot_0", (Objective == NULL) ? "" : Objective->GetName()); - Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::E_DISPLAY_SLOT_SIDEBAR); + Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::dsSidebar); a_Writer.AddString("slot_1", (Objective == NULL) ? "" : Objective->GetName()); - Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::E_DISPLAY_SLOT_NAME); + Objective = m_ScoreBoard->GetObjectiveIn(cScoreboard::dsName); a_Writer.AddString("slot_2", (Objective == NULL) ? "" : Objective->GetName()); a_Writer.EndCompound(); // DisplaySlots @@ -280,7 +280,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT) { AString Name, DisplayName, Prefix, Suffix; - bool AllowsFriendlyFire = false, CanSeeFriendlyInvisible = false; + bool AllowsFriendlyFire = true, CanSeeFriendlyInvisible = false; int CurrLine = a_NBT.FindChildByName(Child, "Name"); if (CurrLine >= 0) @@ -346,7 +346,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT) { AString Name = a_NBT.GetString(CurrLine); - m_ScoreBoard->SetDisplay(Name, cScoreboard::E_DISPLAY_SLOT_LIST); + m_ScoreBoard->SetDisplay(Name, cScoreboard::dsList); } CurrLine = a_NBT.FindChildByName(DisplaySlots, "slot_1"); @@ -354,7 +354,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT) { AString Name = a_NBT.GetString(CurrLine); - m_ScoreBoard->SetDisplay(Name, cScoreboard::E_DISPLAY_SLOT_SIDEBAR); + m_ScoreBoard->SetDisplay(Name, cScoreboard::dsSidebar); } CurrLine = a_NBT.FindChildByName(DisplaySlots, "slot_2"); @@ -362,7 +362,7 @@ bool cScoreboardSerializer::LoadScoreboardFromNBT(const cParsedNBT & a_NBT) { AString Name = a_NBT.GetString(CurrLine); - m_ScoreBoard->SetDisplay(Name, cScoreboard::E_DISPLAY_SLOT_NAME); + m_ScoreBoard->SetDisplay(Name, cScoreboard::dsName); } return true; |