summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-04-17 22:37:00 +0200
committerMattes D <github@xoft.cz>2014-04-17 22:37:00 +0200
commitb7e074b10b1d133b5ca33e00c84b75d4fb817354 (patch)
treeadc938af1f651968871f2e43f4801d6b69c7fc41 /src/WorldStorage
parentAdded area flooring. (diff)
parentCompile fix? (diff)
downloadcuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar.gz
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar.bz2
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar.lz
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar.xz
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.tar.zst
cuberite-b7e074b10b1d133b5ca33e00c84b75d4fb817354.zip
Diffstat (limited to '')
-rw-r--r--src/WorldStorage/FireworksSerializer.cpp2
-rw-r--r--src/WorldStorage/FireworksSerializer.h2
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;