diff options
| author | daniel0916 <theschokolps@gmail.com> | 2014-04-18 15:04:32 +0200 |
|---|---|---|
| committer | daniel0916 <theschokolps@gmail.com> | 2014-04-18 15:04:32 +0200 |
| commit | b239de66db5350319ac626700030bfd688851916 (patch) | |
| tree | 2dd1b87460eb14678cda808c94002d5cebbc2e4a /src/WorldStorage | |
| parent | Fixed Errors (diff) | |
| parent | Added performance test of the nether fort generator. (diff) | |
| download | cuberite-b239de66db5350319ac626700030bfd688851916.tar cuberite-b239de66db5350319ac626700030bfd688851916.tar.gz cuberite-b239de66db5350319ac626700030bfd688851916.tar.bz2 cuberite-b239de66db5350319ac626700030bfd688851916.tar.lz cuberite-b239de66db5350319ac626700030bfd688851916.tar.xz cuberite-b239de66db5350319ac626700030bfd688851916.tar.zst cuberite-b239de66db5350319ac626700030bfd688851916.zip | |
Diffstat (limited to 'src/WorldStorage')
| -rw-r--r-- | src/WorldStorage/FireworksSerializer.cpp | 2 | ||||
| -rw-r--r-- | src/WorldStorage/FireworksSerializer.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/WorldStorage/FireworksSerializer.cpp b/src/WorldStorage/FireworksSerializer.cpp index 744fc731f..e0cd69634 100644 --- a/src/WorldStorage/FireworksSerializer.cpp +++ b/src/WorldStorage/FireworksSerializer.cpp @@ -231,7 +231,7 @@ void cFireworkItem::FadeColoursFromString(const AString & a_String, cFireworkIte -int cFireworkItem::GetVanillaColourCodeFromDye(short a_DyeMeta) +int cFireworkItem::GetVanillaColourCodeFromDye(NIBBLETYPE a_DyeMeta) { /* Colours are supposed to be calculated via: R << 16 + G << 8 + B diff --git a/src/WorldStorage/FireworksSerializer.h b/src/WorldStorage/FireworksSerializer.h index cbc544a14..59f1b09b0 100644 --- a/src/WorldStorage/FireworksSerializer.h +++ b/src/WorldStorage/FireworksSerializer.h @@ -81,7 +81,7 @@ public: static void FadeColoursFromString(const AString & a_String, cFireworkItem & a_FireworkItem); /** Returns a colour code for fireworks used by the network code */ - static int GetVanillaColourCodeFromDye(short a_DyeMeta); + static int GetVanillaColourCodeFromDye(NIBBLETYPE a_DyeMeta); bool m_HasFlicker; bool m_HasTrail; |