Add appveyor.yml

.appveyor.yml

@@ -0,0 +1,67 @@
+############################################################################
+# URDE appveyor build configuration
+############################################################################
+clone_depth: 1
+
+os:
+  - Visual Studio 2015
+
+build:
+  verbosity: detailed
+
+configuration:
+  - Debug
+
+install:
+  ############################################################################
+  # All external dependencies are installed in C:\projects\deps
+  ############################################################################
+  - mkdir C:\projects\deps
+  - cd C:\projects\deps
+
+  ############################################################################
+  # Install Ninja
+  ############################################################################
+  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip"
+  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
+  - 7z x ninja.zip -oC:\projects\deps\ninja > nul
+  - set PATH=C:\projects\deps\ninja;%PATH%
+  - ninja --version
+
+  ############################################################################
+  # Install a recent CMake
+  ############################################################################
+  - set CMAKE_URL="https://cmake.org/files/v3.7/cmake-3.7.1-win64-x64.zip"
+  - appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
+  - 7z x cmake.zip -oC:\projects\deps\cmake > nul
+  - set PATH=C:\projects\deps\cmake\bin;%PATH%
+  - cmake --version
+  
+  ############################################################################
+  # Install custom LLVM
+  ############################################################################
+  - set LLVM_URL="https://www.dropbox.com/s/8vz8ogsxjhhxoi2/LLVM-4.0.0svn-win64-athena.exe?dl=1"
+  - appveyor DownloadFile %LLVM_URL% -FileName llvm.exe
+  - llvm.exe /S /D=C:\projects\deps\llvm
+  - set PATH=C:\projects\deps\llvm\bin;%PATH%
+  - llvm-config --version
+  
+before_build:
+  - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  - cd C:\projects\urde
+  - git submodule update --init --recursive
+
+build_script:
+  - mkdir build
+  - cd build
+  - cmake -GNinja ..
+  - ninja
+  
+notifications:
+  - provider: Slack
+    incoming_webhook:
+      secure: uoO0I0PWyCx0KLjBOG6d17aSVuEEvYztB/UiF8J0LmTb2O735mAdWcuZHTImDFUGZxeI34/qzOB2JKqF+h8dZA5yiprSTkWIookqQjUokAM=
+  
+# Uncomment this to debug AppVeyor failures.
+#on_finish:
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

README.md

@@ -1,5 +1,6 @@
 ## URDE
 **Status:** Extract Only
+[![Build status](https://ci.appveyor.com/api/projects/status/avx3mpu1gd75ju1b?svg=true)](https://ci.appveyor.com/project/jackoalan/urde)
 
 ### Download
 Precompiled builds of the command-line extraction utility (`hecl`) with embedded dataspec libraries are available at https://github.com/AxioDL/urde/releases. This will give you intermediate dumps of original formats as *blender* and *yaml* representations.

Runtime/MP1/CFrontEndUI.cpp

@@ -676,7 +676,7 @@ CFrontEndUI::SFusionBonusFrame::SFusionBonusFrame()
 
 bool CFrontEndUI::SFusionBonusFrame::DoUpdateWithSaveUI(float dt, CSaveUI* saveUi)
 {
-    bool flag = (saveUi && saveUi->x10_uiType != CSaveUI::UIType::Sixteen) ? false : true;
+    bool flag = (saveUi && saveUi->GetUIType() != CSaveUI::UIType::Sixteen) ? false : true;
     x10_remTime = std::max(x10_remTime - dt, 0.f);
 
     zeus::CColor geomCol(zeus::CColor::skWhite);

Runtime/MP1/CSaveUI.hpp

@@ -19,8 +19,9 @@ class CGuiTableGroup;
 namespace MP1
 {
 
-struct CSaveUI
+class CSaveUI
 {
+public:
     enum class UIType
     {
         Zero,
@@ -56,6 +57,7 @@ struct CSaveUI
         }
     }
 
+private:
     u32 x0_instIdx;
     u32 x8_a;
     u32 xc_b;
@@ -83,6 +85,7 @@ struct CSaveUI
     bool x92_ = false;
     bool x93_secondaryInst;
 
+public:
     static std::unique_ptr<CMemoryCardDriver> ConstructCardDriver(bool flag);
     CIOWin::EMessageReturn Update(float dt);
     bool PumpLoad();
@@ -97,6 +100,7 @@ struct CSaveUI
     void StartGame(int idx);
     void EraseGame(int idx);
     void* GetGameData(int idx) const;
+    UIType GetUIType() const { return x10_uiType; }
     CSaveUI(u32 inst, u32 a, u32 b);
 };
 

hecl

@@ -1 +1 @@
-Subproject commit 26c833e1c1a536fafc443ca6cf441896f8b57f96
+Subproject commit c75c8c0a28c8bbe994c56047371414e5b8f394af