Skip to content

Commit

Permalink
Added missing cinematic-related functions
Browse files Browse the repository at this point in the history
  • Loading branch information
emd4600 committed Sep 28, 2024
1 parent 7ece943 commit e64f1aa
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 3 deletions.
35 changes: 35 additions & 0 deletions Spore ModAPI/SourceCode/Simulator/SimulatorMisc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -169,5 +169,40 @@ namespace Simulator
CinematicActionFunction_t CinematicAction::GetStartVignetteFunction() {
return (CinematicActionFunction_t)(GetAddress(CinematicAction, StartVignetteFunction_ptr));
}

int CinematicVignetteActionData::AddRef() {
return DefaultRefCounted::AddRef();
}
int CinematicVignetteActionData::Release() {
return DefaultRefCounted::Release();
}
void* CinematicVignetteActionData::Cast(uint32_t type) const {
CLASS_CAST(CinematicVignetteActionData);
CLASS_CAST(Object);
return nullptr;
}

CinematicVignetteActionData::CinematicVignetteActionData()
: mActorId()
, mVignetteId()
, mVignetteKey()
, mPosition()
, mFacingOffset()
, mRelativePosType(PositionType::Unk1)
, mRelativePosId()
, mFacingType(PositionType::None)
, mFacingId()
, mNoWait()
, mOffsetMultiplier(OffsetMultiplier::None)
, field_50(-1)
{
}

int CinematicAction::AddRef() {
return RefCountTemplate::AddRef();
}
int CinematicAction::Release() {
return RefCountTemplate::Release();
}
}
#endif
9 changes: 6 additions & 3 deletions Spore ModAPI/Spore/Simulator/SubSystem/CinematicManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ namespace Simulator
, public CinematicActionUnkBase
{
public:
virtual ~CinematicAction();
virtual ~CinematicAction() {}
virtual int AddRef() override;
virtual int Release() override;

Expand Down Expand Up @@ -66,7 +66,7 @@ namespace Simulator



class CinematicVignetteAction
class CinematicVignetteActionData
: public Object
, public DefaultRefCounted
{
Expand Down Expand Up @@ -98,6 +98,9 @@ namespace Simulator

static const uint32_t TYPE = 0x55113D6;

CinematicVignetteActionData();
virtual ~CinematicVignetteActionData() {}

virtual int AddRef() override;
virtual int Release() override;
virtual void* Cast(uint32_t type) const override;
Expand All @@ -123,5 +126,5 @@ namespace Simulator
/* 4Ch */ OffsetMultiplier mOffsetMultiplier; // None
/* 50h */ uint32_t field_50; // -1
};
ASSERT_SIZE(CinematicVignetteAction, 0x54);
ASSERT_SIZE(CinematicVignetteActionData, 0x54);
}

0 comments on commit e64f1aa

Please sign in to comment.