Kinda fix TManagedPtr

Dependencies.lua

@@ -1,5 +1,6 @@
 IncludeDir = {}
 IncludeDir.fmod = "%{wks.location}/Toshi/vendor/fmod/include"
+IncludeDir.bink = "%{wks.location}/Toshi/vendor/bink/include"
 IncludeDir.libogg = "%{wks.location}/Toshi/Vendor/libogg/include"
 IncludeDir.libvorbis = "%{wks.location}/Toshi/Vendor/libvorbis/include"
 IncludeDir.libtheora = "%{wks.location}/Toshi/Vendor/libtheora/include"
@@ -9,6 +10,7 @@ IncludeDir.catch2 = "%{wks.location}/Tools/Vendor/Catch2/include"
 
 LibDir = {}
 LibDir.fmod = "%{wks.location}/Toshi/vendor/fmod/lib"
+LibDir.bink = "%{wks.location}/Toshi/vendor/bink/lib"
 LibDir.catch2 = "%{wks.location}/Tools/Vendor/Catch2/lib"
 
 -- content of these folders should be copied to any client application

OpenJPOG/Source/ABINKMoviePlayer.cpp

@@ -0,0 +1 @@
+#include "ABINKMoviePlayer.h"

OpenJPOG/Source/ABINKMoviePlayer.h

@@ -0,0 +1,35 @@
+#pragma once
+
+#include "AMoviePlayer.h"
+#include <dsound.h>
+#include "BINK.H"
+
+TOSHI_NAMESPACE_BEGIN
+
+class ABINKMoviePlayer : public AMoviePlayer
+{
+	virtual TBOOL InitializeMoviePlayer()
+	{
+		HRESULT hResult = DirectSoundCreate(NULL, &m_pDirectSound, NULL);
+		if (FAILED(hResult)) {
+			m_pDirectSound = NULL;
+		} 
+		else {
+			BinkSoundUseDirectSound(m_pDirectSound);
+		}
+		return TTRUE;
+	}
+
+	virtual TBOOL ShutdownMoviePlayer()
+	{
+		if (m_bIsInitialized) {
+			m_bIsInitialized = TFALSE;
+		}
+		return TFALSE;
+	}
+
+private:
+	LPDIRECTSOUND m_pDirectSound;
+};
+
+TOSHI_NAMESPACE_END

OpenJPOG/Source/AMoviePlayer.h

@@ -4,7 +4,6 @@
 #include "TKernel/TVector2.h"
 #include "TRender/TTextureResource.h"
 
-
 TOSHI_NAMESPACE_BEGIN
 
 class AMoviePlayer
@@ -152,7 +151,7 @@ class AMoviePlayer
 		return TNULL;
 	}
 
-private:
+protected:
 	                        // 0x0 vftable
 	TBOOL m_bIsStopped;     // 0x4
 	TBOOL m_bIsInitialized; // 0x5

OpenJPOG/Source/ASoundManager.cpp

@@ -11,7 +11,7 @@ TFLOAT ASoundManager::GetPitch(TINT a_iChannel) const
 		FSOUND_SAMPLE* pSample = FSOUND_GetCurrentSample(a_iChannel);
 		if (pSample) {
 			FSOUND_Sample_GetDefaults(pSample, &freq, NULL, NULL, NULL);
-			return FSOUND_GetFrequency(a_iChannel) / freq;
+			return (TFLOAT)FSOUND_GetFrequency(a_iChannel) / freq;
 		}
 	}
 	return 0.0f;

OpenJPOG/Source/main.cpp

@@ -7,7 +7,8 @@ TBOOL AApplication::OnCreate(TINT argc, TPCHAR* const argv)
 	m_pInputTask = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL);
 	m_pInputTask->Create();
 	m_pInputTask->Activate(TTRUE);
-	m_pInputTask->SetName((TPCHAR)"InputTask");
+	TPCHAR str = (TPCHAR)"InputTask";
+	m_pInputTask->SetName(str);
 
 	return TApplication::OnCreate(argc, argv);
 }

OpenJPOG/premake5.lua

@@ -9,9 +9,8 @@ project ("OpenJPOG")
 		"TKernelInterface",
 		"TApplication",
 		"TRenderInterface",
-		"libtheora",
-		"theoraplay",
-		"fmodvc.lib"
+		"fmodvc.lib",
+		"binkw32.lib"
 	}
 
 	files
@@ -23,7 +22,8 @@ project ("OpenJPOG")
 	includedirs
 	{
 		"%{wks.location}/Toshi/Include",
-		"%{IncludeDir.fmod}"
+		"%{IncludeDir.fmod}",
+		"%{IncludeDir.bink}"
 	}
 
 	defines
@@ -33,14 +33,16 @@ project ("OpenJPOG")
 
 	libdirs
 	{
-		"%{LibDir.fmod}"
+		"%{LibDir.fmod}",
+		"%{LibDir.bink}"
 	}
 
 	postbuildcommands
 	{
 		"{COPY} \"%{wks.location}bin/" .. outputdir .. "/TKernelInterface/TKernelInterface.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
 		"{COPY} \"%{wks.location}bin/" .. outputdir .. "/TApplication/TApplication.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
 		"{COPY} \"%{wks.location}Toshi/vendor/fmod/lib/fmod.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
+		"{COPY} \"%{wks.location}Toshi/vendor/bink/lib/binkw32.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"",
 	}
 
 	filter "system:windows"

Toshi/Include/TKernel/TKernelInterface.h

@@ -17,7 +17,7 @@ class TOSHI_EXPORT TKernelInterface : public TObject
 	void DumpInfo();
 
 	THPTimer* GetSystemTimer() { return &m_oSysTimer; }
-	TScheduler* GetScheduler() const { return (TScheduler*)&m_pScheduler; }
+	TScheduler* GetScheduler() const { return m_pScheduler.m_pObject; }
 private:
 	THPTimer m_oSysTimer;                     // 0x8
 	TManagedPointer<TScheduler> m_pScheduler; // 0x30

Toshi/Include/TKernel/TManagedPointer.h

@@ -34,7 +34,7 @@ class TOSHI_EXPORT TManagedPointer
 
     T* operator->() { TASSERT(m_pObject != TNULL); return m_pObject; }
 
-private:
+public:
 	T* m_pObject;
 };
 

Toshi/Include/TKernel/TObject.h

@@ -132,7 +132,7 @@ private: \
 
 class TOSHI_EXPORT TObject
 {	
-public: 
+private: 
 	static TObject* TOSHI_API CreateObject()
 	{
 		return new TObject;
@@ -151,7 +151,7 @@ class TOSHI_EXPORT TObject
 	TBOOL IsExactly(const TClass& a_rClass) const { return GetClass().IsExactly(a_rClass); }
 
 	virtual TClass& GetClass() const { return m_sClass; }
-	inline static TClass m_sClass = TClass("TObject", TNULL, CreateObject, TObject::CreateObjectInPlace, TObject::InitialiseStatic, TObject::DeinitialiseStatic, 1);
+	inline static TClass m_sClass = TClass("TObject", TNULL, TObject::CreateObject, TObject::CreateObjectInPlace, TObject::InitialiseStatic, TObject::DeinitialiseStatic, 1);
 
 protected:
 	TObject() {}

Toshi/Source/TKernel/Win/TNativeFileWin.cpp

@@ -104,8 +104,8 @@ TINT TNativeFile::Read(TPVOID a_pBuffer, TINT a_iSize)
     if (readedCount != a_iSize && LoadBuffer(curBufferPos))
     {
         a_iSize -= readedCount;
-        DWORD bufferLeftSize = m_iPosition - curBufferPos;
-        DWORD readCount = m_iLastBufferSize - bufferLeftSize;
+        TINT bufferLeftSize = m_iPosition - curBufferPos;
+        TINT readCount = m_iLastBufferSize - bufferLeftSize;
         if (readCount < a_iSize) {
             readCount = a_iSize;
         }