From 6301af3133003e4de5b9e55e87ba7921fab90afa Mon Sep 17 00:00:00 2001
From: Phillip <antidote.crk@gmail.com>
Date: Tue, 22 Mar 2016 11:35:52 -0700
Subject: [PATCH] Windows Fixes

---
 Runtime/Graphics/CModelBoo.cpp       |  1 +
 Runtime/GuiSys/CGuiBackground.cpp    |  2 +-
 Runtime/GuiSys/CGuiTableGroup.cpp    | 13 +++++++++++++
 Runtime/GuiSys/CGuiTextSupport.cpp   |  1 +
 Runtime/GuiSys/CGuiWidget.cpp        |  7 +++++++
 Runtime/GuiSys/CRasterFont.cpp       |  1 +
 Runtime/GuiSys/CTextRenderBuffer.hpp | 14 +++++++++++---
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp
index 86bf70066..e6f07b1fa 100644
--- a/Runtime/Graphics/CModelBoo.cpp
+++ b/Runtime/Graphics/CModelBoo.cpp
@@ -13,6 +13,7 @@ void CModel::Touch(int) const
 
 bool CModel::IsLoaded(int) const
 {
+    return false;
 }
 
 }
diff --git a/Runtime/GuiSys/CGuiBackground.cpp b/Runtime/GuiSys/CGuiBackground.cpp
index 47ce7731e..a9a5e4069 100644
--- a/Runtime/GuiSys/CGuiBackground.cpp
+++ b/Runtime/GuiSys/CGuiBackground.cpp
@@ -28,7 +28,7 @@ CGuiBackground* CGuiBackground::Create(CGuiFrame* frame, CInputStream& in, bool
     in.readUint32Big();
     in.readUint32Big();
     in.readUint32Big();
-
+    return nullptr;
 }
 
 }
diff --git a/Runtime/GuiSys/CGuiTableGroup.cpp b/Runtime/GuiSys/CGuiTableGroup.cpp
index 823f1bdd1..96ef7695a 100644
--- a/Runtime/GuiSys/CGuiTableGroup.cpp
+++ b/Runtime/GuiSys/CGuiTableGroup.cpp
@@ -189,54 +189,67 @@ CGuiTableGroup::CGuiTableGroup(const CGuiWidgetParms& parms, int a, int b, ETabl
 
 bool CGuiTableGroup::MAF_SelectNextColumn(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectPrevColumn(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectNextRow(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectPrevRow(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectNextColumnSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectPrevColumnSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectNextRowSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectPrevRowSkipUnActivated(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectColumnAtIndex(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_SelectRowAtIndex(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_InitializeTable(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_MenuAdvance(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiTableGroup::MAF_MenuCancel(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 CGuiTableGroup* CGuiTableGroup::Create(CGuiFrame* frame, CInputStream& in, bool flag)
diff --git a/Runtime/GuiSys/CGuiTextSupport.cpp b/Runtime/GuiSys/CGuiTextSupport.cpp
index 9bef6ff0d..59012ef34 100644
--- a/Runtime/GuiSys/CGuiTextSupport.cpp
+++ b/Runtime/GuiSys/CGuiTextSupport.cpp
@@ -6,6 +6,7 @@
 #include "CTextParser.hpp"
 #include "Graphics/CGraphicsPalette.hpp"
 #include "Graphics/CGraphics.hpp"
+#include "GuiSys/CRasterFont.hpp"
 
 namespace urde
 {
diff --git a/Runtime/GuiSys/CGuiWidget.cpp b/Runtime/GuiSys/CGuiWidget.cpp
index 1d124aca8..abd868437 100644
--- a/Runtime/GuiSys/CGuiWidget.cpp
+++ b/Runtime/GuiSys/CGuiWidget.cpp
@@ -67,6 +67,7 @@ CGuiWidget* CGuiWidget::Create(CGuiFrame* frame, CInputStream& in, bool flag)
 
 bool CGuiWidget::Message(const CGuiMessage& msg)
 {
+    return false;
 }
 
 void CGuiWidget::ParseBaseInfo(CGuiFrame* frame, CInputStream& in, const CGuiWidgetParms& parms)
@@ -703,26 +704,32 @@ void CGuiWidget::SetIsActive(bool a, bool b)
 
 bool CGuiWidget::MAF_StartAnimationSet(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiWidget::MAF_SendMessage(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiWidget::MAF_PauseAnim(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiWidget::MAF_ResumeAnim(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiWidget::MAF_SetState(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 bool CGuiWidget::MAF_SetStateOfWidget(CGuiFunctionDef* def, CGuiControllerInfo* info)
 {
+    return false;
 }
 
 }
diff --git a/Runtime/GuiSys/CRasterFont.cpp b/Runtime/GuiSys/CRasterFont.cpp
index 32de2b552..bb772b305 100644
--- a/Runtime/GuiSys/CRasterFont.cpp
+++ b/Runtime/GuiSys/CRasterFont.cpp
@@ -1,6 +1,7 @@
 #include "GuiSys/CRasterFont.hpp"
 #include "CDrawStringOptions.hpp"
 #include "CTextRenderBuffer.hpp"
+#include "Graphics/CTexture.hpp"
 
 namespace urde
 {
diff --git a/Runtime/GuiSys/CTextRenderBuffer.hpp b/Runtime/GuiSys/CTextRenderBuffer.hpp
index 841b68d4b..00b01340b 100644
--- a/Runtime/GuiSys/CTextRenderBuffer.hpp
+++ b/Runtime/GuiSys/CTextRenderBuffer.hpp
@@ -86,21 +86,29 @@ private:
     struct BooFontCharacters
     {
         TToken<CRasterFont> m_font;
-        boo::IGraphicsBufferD* m_instBuf;
-        boo::IShaderDataBinding* m_dataBinding;
+        boo::IGraphicsBufferD* m_instBuf = nullptr;
+        boo::IShaderDataBinding* m_dataBinding = nullptr;
         std::vector<BooCharacterInstance> m_charData;
         u32 m_charCount = 0;
         bool m_dirty = true;
+        BooFontCharacters(const CToken& token)
+            : m_font(token)
+        {
+        }
     };
     std::vector<BooFontCharacters> m_fontCharacters;
 
     struct BooImage
     {
         CFontImageDef m_imageDef;
-        boo::IGraphicsBufferD* m_instBuf;
+        boo::IGraphicsBufferD* m_instBuf = nullptr;
         std::vector<boo::IShaderDataBinding*> m_dataBinding;
         BooImageInstance m_imageData;
         bool m_dirty = true;
+        BooImage(const CFontImageDef& imgDef)
+            : m_imageDef(imgDef)
+        {
+        }
     };
     std::vector<BooImage> m_images;