mirror of https://github.com/AxioDL/metaforce.git
Fix missing CMoviePlayer::Initialize call
This commit is contained in:
parent
ad1453ac08
commit
1583248896
|
@ -1,5 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <compare>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
|
@ -146,7 +147,7 @@ public:
|
|||
[[nodiscard]] u32 GetUsedTextureSlots() const { return static_cast<u32>(GetFlags()) >> 16; }
|
||||
[[nodiscard]] u32 GetTextureCount() const { return SBig(*reinterpret_cast<const u32*>(x0_data + 4)); }
|
||||
[[nodiscard]] u32 GetVertexDesc() const {
|
||||
return SBig(*reinterpret_cast<const u32*>(&x0_data + (GetTextureCount() * 4) + 8));
|
||||
return SBig(*reinterpret_cast<const u32*>(x0_data + (GetTextureCount() * 4) + 8));
|
||||
}
|
||||
|
||||
static void ResetCachedMaterials();
|
||||
|
|
|
@ -41,7 +41,10 @@ static float SfxVolume = 1.f;
|
|||
|
||||
void CMoviePlayer::Initialize() { TjHandle = tjInitDecompress(); }
|
||||
|
||||
void CMoviePlayer::Shutdown() { tjDestroy(TjHandle); }
|
||||
void CMoviePlayer::Shutdown() {
|
||||
tjDestroy(TjHandle);
|
||||
TjHandle = nullptr;
|
||||
}
|
||||
|
||||
void CMoviePlayer::THPHeader::swapBig() {
|
||||
magic = SBig(magic);
|
||||
|
|
|
@ -378,6 +378,8 @@ void CMain::InitializeSubsystems() {
|
|||
CDecalManager::Initialize();
|
||||
CGBASupport::Initialize();
|
||||
CPatterned::Initialize();
|
||||
// Metaforce additions
|
||||
CMoviePlayer::Initialize();
|
||||
}
|
||||
|
||||
void CMain::MemoryCardInitializePump() {
|
||||
|
@ -693,12 +695,13 @@ void CMain::Draw() {
|
|||
}
|
||||
|
||||
void CMain::ShutdownSubsystems() {
|
||||
CMoviePlayer::Shutdown();
|
||||
CDecalManager::Shutdown();
|
||||
CElementGen::Shutdown();
|
||||
CAnimData::FreeCache();
|
||||
CMemoryCardSys::Shutdown();
|
||||
CMappableObject::Shutdown();
|
||||
// Metaforce additions
|
||||
CMoviePlayer::Shutdown();
|
||||
}
|
||||
|
||||
void CMain::Shutdown() {
|
||||
|
|
Loading…
Reference in New Issue