From 67197621a177153754c17e334850edb684ec04c2 Mon Sep 17 00:00:00 2001
From: Jack Andersen <jackoalan@gmail.com>
Date: Mon, 9 Jul 2018 08:08:44 -1000
Subject: [PATCH] Fix fixed position camera hint

---
 NESEmulator/CNESShader.cpp            | 4 ++--
 Runtime/Audio/CStreamAudioManager.cpp | 2 +-
 Runtime/Camera/CBallCamera.cpp        | 1 +
 Runtime/Graphics/CMoviePlayer.cpp     | 2 +-
 Runtime/MP1/CFrontEndUI.cpp           | 2 +-
 amuse                                 | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/NESEmulator/CNESShader.cpp b/NESEmulator/CNESShader.cpp
index 569cf85de..0f9683f72 100644
--- a/NESEmulator/CNESShader.cpp
+++ b/NESEmulator/CNESShader.cpp
@@ -305,7 +305,7 @@ void CNESShader::Initialize()
             break;
 #endif
 #if _WIN32
-            case boo::IGraphicsDataFactory::Platform::D3D11:
+        case boo::IGraphicsDataFactory::Platform::D3D11:
             Initialize(static_cast<boo::D3DDataFactory::Context&>(ctx));
             break;
 #endif
@@ -315,7 +315,7 @@ void CNESShader::Initialize()
             break;
 #endif
 #if BOO_HAS_VULKAN
-            case boo::IGraphicsDataFactory::Platform::Vulkan:
+        case boo::IGraphicsDataFactory::Platform::Vulkan:
             Initialize(static_cast<boo::VulkanDataFactory::Context&>(ctx));
             break;
 #endif
diff --git a/Runtime/Audio/CStreamAudioManager.cpp b/Runtime/Audio/CStreamAudioManager.cpp
index cc82abf09..a54a8065b 100644
--- a/Runtime/Audio/CStreamAudioManager.cpp
+++ b/Runtime/Audio/CStreamAudioManager.cpp
@@ -3,7 +3,7 @@
 #include "CDvdFile.hpp"
 #include "CDvdRequest.hpp"
 #include "Audio/CAudioSys.hpp"
-#include "amuse/DSPCodec.h"
+#include "amuse/DSPCodec.hpp"
 #include <memory>
 
 namespace urde
diff --git a/Runtime/Camera/CBallCamera.cpp b/Runtime/Camera/CBallCamera.cpp
index 16f143a7e..0194837ad 100644
--- a/Runtime/Camera/CBallCamera.cpp
+++ b/Runtime/Camera/CBallCamera.cpp
@@ -2285,6 +2285,7 @@ void CBallCamera::UpdateLookAtPosition(float dt, CStateManager& mgr)
                 lookAtOffsetAhead = moveXf * lookAtOffsetAhead;
             zeus::CVector3f lookAtPosAhead = ballPos + lookAtOffsetAhead;
             x1c0_lookPosAhead = lookAtPosAhead;
+            x1cc_fixedLookPos = ballPos + zeus::CVector3f(0.f, 0.f, lookAtOffsetAhead.z);
             zeus::CVector3f aheadToCurrentLookDelta = x1d8_lookPos - lookAtPosAhead;
             float aheadToCurrentLookMag = aheadToCurrentLookDelta.magnitude();
             if (aheadToCurrentLookDelta.canBeNormalized())
diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp
index b43ef5e00..dcdff70ea 100644
--- a/Runtime/Graphics/CMoviePlayer.cpp
+++ b/Runtime/Graphics/CMoviePlayer.cpp
@@ -3,7 +3,7 @@
 #include "specter/View.hpp"
 #include "CGraphics.hpp"
 #include "Audio/g721.h"
-#include "amuse/DSPCodec.h"
+#include "amuse/DSPCodec.hpp"
 #include "CDvdRequest.hpp"
 #include <turbojpeg.h>
 
diff --git a/Runtime/MP1/CFrontEndUI.cpp b/Runtime/MP1/CFrontEndUI.cpp
index 63b377fb2..533fa6405 100644
--- a/Runtime/MP1/CFrontEndUI.cpp
+++ b/Runtime/MP1/CFrontEndUI.cpp
@@ -2006,7 +2006,7 @@ CFrontEndUI::CFrontEndUI()
 
     m->ResetGameState();
     g_GameState->SetCurrentWorldId(g_ResFactory->TranslateOriginalToNew(g_DefaultWorldTag.id));
-    g_GameState->CurrentWorldState().SetAreaId(26);
+    g_GameState->CurrentWorldState().SetAreaId(7);
     g_GameState->GameOptions().ResetToDefaults();
     g_GameState->WriteBackupBuf();
 
diff --git a/amuse b/amuse
index 1e8ce19b1..cdc720b8a 160000
--- a/amuse
+++ b/amuse
@@ -1 +1 @@
-Subproject commit 1e8ce19b167c80706ed396d32d1cc573c2b2a7ee
+Subproject commit cdc720b8a7b7cade5f3ca22d98ee9c8aec16b8a8