flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed compile

Browse Source
This commit is contained in:
Tiger Wang 2014-02-27 21:48:49 +00:00
parent a97f28939f
commit 528467bc5c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/WorldStorage/FireworksSerializer.cpp
View File

@ -2,7 +2,6 @@
#include "Globals.h" #include "Globals.h"
#include "FireworksSerializer.h" #include "FireworksSerializer.h"
#include "WorldStorage/FastNBT.h" #include "WorldStorage/FastNBT.h"
#include <sstream>
@ -219,7 +218,7 @@ void cFireworkItem::FadeColoursFromString(const AString & a_String, cFireworkIte
int GetVanillaColourCodeFromDye(short a_DyeMeta) int cFireworkItem::GetVanillaColourCodeFromDye(short a_DyeMeta)
{ {
/* /*
Colours are supposed to be calculated via: R << 16 + G << 8 + B Colours are supposed to be calculated via: R << 16 + G << 8 + B

2
src/WorldStorage/FireworksSerializer.h
View File

@ -77,7 +77,7 @@ public:
static void FadeColoursFromString(const AString & a_String, cFireworkItem & a_FireworkItem); static void FadeColoursFromString(const AString & a_String, cFireworkItem & a_FireworkItem);
/** Returns a colour code for fireworks used by the network code */ /** Returns a colour code for fireworks used by the network code */
static const inline int GetVanillaColourCodeFromDye(short a_DyeMeta); static int GetVanillaColourCodeFromDye(short a_DyeMeta);
bool m_HasFlicker; bool m_HasFlicker;
bool m_HasTrail; bool m_HasTrail;