Game-Decompilation/Petari
1
0
Fork 0
mirror of https://github.com/SMGCommunity/Petari.git synced 2024-11-23 13:40:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make changes so a clean build compiles

Browse Source 
`StageDataHolder::getCommonPathPointInfo` and
`StageDataHolder::getCommonPathPointInfoFromRailDataIndex` both had
different return types between their headers and source files. I updated
the header return type based on the source return type because the
source file was more recently updated (see commit b5dc6e8).

CameraUtil.cpp also had a mismatched return type with its header.

`MultiEmitterCallBack.hpp` was deleted for no apparent reason, so I
restored it and gave `JPAEmitterCallback` its own header.
This commit is contained in:
Headpenguin 2024-06-27 08:46:50 -04:00
parent a0bd939dac
commit 1649bb2727
6 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/Game/Scene/StageDataHolder.hpp
View File

@ -15,8 +15,8 @@ public:
void requestFileLoadCommon();
void requestFileLoadScenario();
void initPlacement();
JMapInfo& getCommonPathPointInfo(const JMapInfo **, int) const;
JMapInfo& getCommonPathPointInfoFromRailDataIndex(const JMapInfo **, int) const;
JMapInfo getCommonPathPointInfo(const JMapInfo **, int) const;
JMapInfo getCommonPathPointInfoFromRailDataIndex(const JMapInfo **, int) const;
s32 getCommonPathInfoElementNum() const;
s32 getStartPosNum() const;
s32 getCurrentStartZoneId() const;

12
libs/JSystem/include/JSystem/JParticle/JPAEmitterCallback.hpp Normal file
View File

@ -0,0 +1,12 @@
#pragma once
class JPABaseEmitter;
class JPAEmitterCallBack {
virtual ~JPAEmitterCallBack();
virtual void execute(JPABaseEmitter *);
virtual void executeAfter(JPABaseEmitter *);
virtual void draw(JPABaseEmitter *);
virtual void drawAfter(JPABaseEmitter *);
virtual void init(JPABaseEmitter *) = 0;
};

12
libs/JSystem/include/JSystem/JParticle/JPAParticleCallBack.hpp
View File

@ -1,16 +1,8 @@
#pragma once
class JPABaseEmitter;
class JPABaseParticle;
#include <JSystem/JParticle/JPAEmitterCallback.hpp>
class JPAEmitterCallBack {
virtual ~JPAEmitterCallBack();
virtual void execute(JPABaseEmitter *);
virtual void executeAfter(JPABaseEmitter *);
virtual void draw(JPABaseEmitter *);
virtual void drawAfter(JPABaseEmitter *);
virtual void init(JPABaseEmitter *) = 0;
};
class JPABaseParticle;
class JPAParticleCallBack {
public:

8
libs/JSystem/include/JSystem/JParticle/MultiEmitterCallBack.hpp Normal file
View File

@ -0,0 +1,8 @@
#pragma once
#include <JSystem/JParticle/JPAEmitterCallBack.hpp>
class MultiEmitterCallBackBase : public JPAEmitterCallBack {
virtual ~MultiEmitterCallBackBase();
virtual void init(JPABaseEmitter *);
};

4
source/Game/System/GalaxyStatusAccessor.cpp
View File

@ -252,10 +252,10 @@ bool GalaxyStatusAccessor::isHiddenStar(s32 scenario) const {
namespace MR {
GalaxyStatusAccessor makeGalaxyStatusAccessor(const char *pGalaxyName) {
return ScenarioDataFunction::getScenarioDataParser()->makeAccessor(pGalaxyName);
return ScenarioDataFunction::getScenarioDataParser().makeAccessor(pGalaxyName);
}
GalaxyStatusAccessor makeCurrentGalaxyStatusAccessor() {
return ScenarioDataFunction::getScenarioDataParser()->makeAccessor(MR::getCurrentStageName());
return ScenarioDataFunction::getScenarioDataParser().makeAccessor(MR::getCurrentStageName());
}
};

2
source/Game/Util/CameraUtil.cpp
View File

@ -34,7 +34,7 @@ namespace MR {
MR::getSceneObj<CameraContext*>(SceneObj_CameraContext)->setShakeOffset(a1, a2);
}
TVec3f getCamPos() {
const TVec3f getCamPos() {
TPos3f viewMtx = *MR::getSceneObj<CameraContext*>(SceneObj_CameraContext)->getInvViewMtx();
TVec3f pos;
MR::extractMtxTrans(viewMtx.toMtxPtr(), &pos);