Merge branch 'master' into MoreLanguages

# Conflicts:
#	src/core/Frontend.cpp
#	src/core/MenuScreens.h
#	src/render/Font.cpp
#	src/render/Font.h
#	src/text/Messages.cpp
#	src/text/Text.cpp

1 files changed, 7 insertions, 7 deletions

diff --git a/src/render/Sprite2d.h b/src/render/Sprite2d.h
index 268c7d2b..0e12d441 100644
--- a/src/render/Sprite2d.h
+++ b/src/render/Sprite2d.h
@@ -2,13 +2,13 @@
 
 class CSprite2d
 {
-	static float &RecipNearClip;
-	static int32 &mCurrentBank;
-	static RwTexture **mpBankTextures;	//[10];
-	static int32 *mCurrentSprite;	//[10];
-	static int32 *mBankStart;	//[10];
-	static RwIm2DVertex *maBankVertices;	//[500];
-	static RwIm2DVertex *maVertices;	//[4];
+	static float RecipNearClip;
+	static int32 mCurrentBank;
+	static RwTexture *mpBankTextures[10];
+	static int32 mCurrentSprite[10];
+	static int32 mBankStart[10];
+	static RwIm2DVertex maBankVertices[500];
+	static RwIm2DVertex maVertices[8];
 public:
 	RwTexture *m_pTexture;