Skip to content

RPSysSceneMgr OK, Match changeSceneAfterFade #147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kiwi515 merged 2 commits into from
Aug 29, 2026
Merged

RPSysSceneMgr OK, Match changeSceneAfterFade #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b5a437
RPSysSceneMgr OK
kiwi515 Aug 29, 2026
5d9ae7d
Match `changeSceneAfterFade`
kiwi515 Aug 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1208,7 +1208,7 @@ def MatchingFor(*versions):
Object(NonMatching, "Pack/RPSystem/RPSysSceneCreator.cpp"),
Object(Matching, "Pack/RPSystem/RPSysScene.cpp"),
Object(Matching, "Pack/RPSystem/RPSysRenderMode.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysSceneMgr.cpp"),
Object(Matching, "Pack/RPSystem/RPSysSceneMgr.cpp"),
Object(Matching, "Pack/RPSystem/RPSysProjectLocal.cpp"),
Object(Matching, "Pack/RPSystem/RPSysGameConfig.cpp"),
Object(NonMatching, "Pack/RPSystem/RPSysTagParms.cpp"),
Expand Down
2 changes: 1 addition & 1 deletion src/Pack/RPSystem/RPSysSceneCreator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ bool RPSysSceneCreator::changeSceneAfterFade(s32 id, bool reconfigure) {
bool success = false;

if (RP_GET_INSTANCE(RPSysSceneMgr)->isTaskFinished()) {
s32 current = RP_GET_INSTANCE(RPSysSceneMgr)->getCurrentSceneID();
int current = RP_GET_INSTANCE(RPSysSceneMgr)->getCurrentSceneID();

if (reconfigure) {
id = current;
Expand Down
4 changes: 2 additions & 2 deletions src/Pack/RPSystem/RPSysSceneMgr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ bool RPSysSceneMgr::changeNextSceneAfterFade(s32 id, bool reconfigure) {
EMethod method = Default;

if (getCurrentSceneRP() != NULL) {
s32 current = getCurrentSceneRP()->getSceneID();
int current = getCurrentSceneRP()->getSceneID();

// Parent scene's exit type takes priority over the new create type
RPSysSceneCreator::EExitType exitType =
Expand Down Expand Up @@ -486,7 +486,7 @@ void RPSysSceneMgr::updateState() {
} else if (mState == EState_ReturnToMenu ||
mState == EState_Shutdown) {

setSceneFadeColor(DEFAULT_FADE_COLOR);
setFadeColor(DEFAULT_FADE_COLOR);

RP_GET_INSTANCE(RPSndAudioMgr)
->shutdownSystem(DEFAULT_FADE_FRAME);
Expand Down
Loading