AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 00:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into omegapirate

Browse Source 
# Conflicts:
#	Runtime/GuiSys/CAuiImagePane.cpp
This commit is contained in:
Luke Street
2020-04-19 22:12:18 -04:00
parent de5513e277 1fd28d3fc3
commit 32c44cbf05
37 changed files with 149 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/MP1/CInGameGuiManager.hpp
View File

@@ -7,6 +7,7 @@
#include "DataSpec/DNACommon/Tweaks/ITweakGui.hpp"
#include "Runtime/CDependencyGroup.hpp"
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/CStateManager.hpp"
@@ -30,7 +31,6 @@ namespace urde {
class CActorLights;
class CArchitectureQueue;
class CAutoMapper;
class CDependencyGroup;
class CGuiCamera;
class CGuiModel;
class CModelData;

8
Runtime/MP1/CSamusHud.cpp
View File

@@ -139,7 +139,7 @@ void CSamusHud::InitializeFrameGlueMutable(const CStateManager& mgr) {
CPlayerState& playerState = *mgr.GetPlayerState();
CPlayerGun& gun = *player.GetPlayerGun();
float chargeFactor = gun.IsCharging() ? gun.GetChargeBeamFactor() : 0.f;
bool missilesActive = gun.GetMissleMode() == CPlayerGun::EMissleMode::Active;
bool missilesActive = gun.GetMissleMode() == CPlayerGun::EMissileMode::Active;
bool lockedOnObj = player.GetOrbitTargetId() != kInvalidUniqueId;
switch (x2bc_nextState) {
@@ -477,7 +477,7 @@ void CSamusHud::UpdateMissile(float dt, const CStateManager& mgr, bool init) {
u32 numMissles = playerState.GetItemAmount(CPlayerState::EItemType::Missiles);
u32 missileCap = playerState.GetItemCapacity(CPlayerState::EItemType::Missiles);
CPlayerGun::EMissleMode missileMode = gun.GetMissleMode();
CPlayerGun::EMissileMode missileMode = gun.GetMissleMode();
float chargeFactor = gun.IsCharging() ? gun.GetChargeBeamFactor() : 0.f;
if (x294_missileIntf)
@@ -491,7 +491,7 @@ void CSamusHud::UpdateMissile(float dt, const CStateManager& mgr, bool init) {
if (numMissles != x2d8_missileAmount)
x294_missileIntf->SetNumMissiles(numMissles, mgr);
if (missileMode != x2ec_missileMode)
x294_missileIntf->SetIsMissilesActive(missileMode == CPlayerGun::EMissleMode::Active);
x294_missileIntf->SetIsMissilesActive(missileMode == CPlayerGun::EMissileMode::Active);
}
x2d8_missileAmount = numMissles;
x2ec_missileMode = missileMode;
@@ -600,7 +600,7 @@ void CSamusHud::UpdateCameraDebugSettings() {
}
void CSamusHud::UpdateEnergyLow(float dt, const CStateManager& mgr) {
bool cineCam = TCastToConstPtr<CCinematicCamera>(mgr.GetCameraManager()->GetCurrentCamera(mgr));
const bool cineCam = TCastToConstPtr<CCinematicCamera>(mgr.GetCameraManager()->GetCurrentCamera(mgr)).IsValid();
float oldTimer = x57c_energyLowTimer;
x57c_energyLowTimer = std::fmod(x57c_energyLowTimer + dt, 0.5f);

2
Runtime/MP1/CSamusHud.hpp
View File

@@ -101,7 +101,7 @@ class CSamusHud {
bool x2e0_27_energyLow : 1;
u32 x2e4_ = 0;
u32 x2e8_ = 0;
CPlayerGun::EMissleMode x2ec_missileMode = CPlayerGun::EMissleMode::Inactive;
CPlayerGun::EMissileMode x2ec_missileMode = CPlayerGun::EMissileMode::Inactive;
float x2f0_visorBeamMenuAlpha = 1.f;
zeus::CVector3f x2f8_fpCamDir;
zeus::CVector3f x304_basewidgetIdlePos;

2
Runtime/MP1/CSlideShow.hpp
View File

@@ -4,6 +4,7 @@
#include <string>
#include <vector>
#include "Runtime/CDependencyGroup.hpp"
#include "Runtime/CIOWin.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
@@ -16,7 +17,6 @@
#include <zeus/CVector2f.hpp>
namespace urde {
class CDependencyGroup;
class CTexture;
class CSlideShow : public CIOWin {

6
Runtime/MP1/World/CFlaahgra.cpp
View File

@@ -297,9 +297,9 @@ void CFlaahgra::DoUserAnimEvent(CStateManager& mgr, const CInt32POINode& node, E
return;
}
case EUserEventType::BeginAction: {
#ifndef NDEBUG
printf("BeginAction\n");
#endif
//#ifndef NDEBUG
// printf("BeginAction\n");
//#endif
x8e4_26_ = true;
x7c4_ = GetEndActionTime();
break;