From 00a3000d1d31d3dc1fd710f0eefebcdc5b3c8ae7 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Tue, 16 May 2017 15:52:00 +0800
Subject: [PATCH] Fix bug in Font::setFontStyle

---
 MiniEngine.h | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/MiniEngine.h b/MiniEngine.h
index c74064e..00cfa1d 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -362,13 +362,14 @@ namespace MiniEngine
 		template<typename... Args>
 		void setFontStyle(Style style,Args&&... args)
 		{
-            _internal_fontcalc=0;
-            _setFontStyle(style,std::forward(args...));
+		    int fontcalc=0;
+		    _setFontStyle(fontcalc,style,args...);
 		}
 
 		void setFontStyle(Style style)
 		{
-            _real_setFontStyle(_style_caster(style));
+            int fontcalc=0;
+            _setFontStyle(fontcalc,style);
 		}
 
 		std::tuple<Style> getFontStyles();
@@ -397,21 +398,20 @@ namespace MiniEngine
 		Texture renderUTF8Solid(Renderer rnd, std::string Text, RGBA fg);
     protected:
 		template<typename... Args>
-        void _setFontStyle(Style style,Args&&... args)
+        void _setFontStyle(int& fontcalc,Style style,Args&&... args)
         {
-            _internal_fontcalc|=_style_caster(style);
-            _setFontStyle(args...);
+            fontcalc|=_style_caster(style);
+            _setFontStyle(fontcalc,args...);
         }
 
-        void _setFontStyle(Style style)
+        void _setFontStyle(int& fontcalc,Style style)
         {
-            _internal_fontcalc|=_style_caster(style);
-            _real_setFontStyle(_internal_fontcalc);
+            fontcalc|=_style_caster(style);
+            _real_setFontStyle(fontcalc);
         }
 	private:
 	    void _real_setFontStyle(int);
 	    int _style_caster(Style);
-        int _internal_fontcalc;
 
 		std::shared_ptr<TTF_Font> _font;
 		void _set(TTF_Font*);