Merge branch 'master' into wp8

2013-11-26 05:09:34 +01:00
parent ca3084221c a695323bc7
commit ac54bf32d3
20 changed files with 154 additions and 113 deletions
@@ -1,3 +1,6 @@
+#ifndef _CACHE_ENGINE_H_
+#define _CACHE_ENGINE_H_
+
 #include "PrecompiledHeader.h"

 #include "Threading.h"
@@ -208,3 +211,5 @@ public:

 CardRetrieverBase* CacheEngine::sInstance = NULL;
 bool CacheEngine::sIsThreaded = false;
+
+#endif //_CACHE_ENGINE_H_
@@ -1,3 +1,5 @@
+#ifndef _DECK_EDITOR_MENU_H
+#define _DECK_EDITOR_MENU_H
 #pragma once
 #include "DeckMenu.h"
 #include "DeckDataWrapper.h"
@@ -19,3 +21,4 @@ public:
    void Render();
    virtual ~DeckEditorMenu();
 };
+#endif //_DECK_EDITOR_MENU_H
@@ -1,3 +1,6 @@
+#ifndef _DECK_MANAGER_H
+#define _DECK_MANAGER_H
+
 #include <string>
 #include <vector>

@@ -43,3 +46,5 @@ public:
    ~DeckManager();

 };
+
+#endif //_DECK_MANAGER_H
@@ -1,3 +1,6 @@
+#ifndef _GUI_MANA_H
+#define _GUI_MANA_H
+
 #include "string.h"
 #include <vector>
 #include <hge/hgeparticle.h>
@@ -51,3 +54,5 @@ public:
    virtual int receiveEventPlus(WEvent * e);
    virtual int receiveEventMinus(WEvent * e);
 };
+
+#endif //_GUI_MANA_H
@@ -1,4 +1,4 @@
-#ifndef _MTGPACCK_H_
+#ifndef _MTGPACK_H_
 #define _MTGPACK_H_

 class ShopBooster;
@@ -1,3 +1,6 @@
+#ifndef _STYLE_MANAGER_H_
+#define _STYLE_MANAGER_H_
+
 class WStyle
 {
 public:
@@ -34,3 +37,5 @@ protected:
    string activeStyle;
    map<string, WStyle*> styles;
 };
+
+#endif //_STYLE_MANAGER_H_