diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7c6e34a..09df9e5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: steps: - name : Checkout - uses : actions/checkout@v3 + uses : actions/checkout@v4 - name : Build artifacts id : build @@ -35,7 +35,7 @@ jobs: id : set-output shell : bash run : | - echo "::set-output name=filename-${{ matrix.emu }}::${{ steps.build.outputs.filename }}" + echo "filename-${{ matrix.emu }}=${{ steps.build.outputs.filename }}" >> $GITHUB_OUTPUT release: needs: build diff --git a/.gitignore b/.gitignore index fab39ec..d1917ce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/linkerscripts/symstemp.ld starlight_patch_100/** build100/** romfs stuff/** diff --git a/include/server/gamemode/GameModeManager.hpp b/include/server/gamemode/GameModeManager.hpp index 8815b25..e0204fe 100644 --- a/include/server/gamemode/GameModeManager.hpp +++ b/include/server/gamemode/GameModeManager.hpp @@ -11,7 +11,6 @@ class GameModeManager { SEAD_SINGLETON_DISPOSER(GameModeManager) GameModeManager(); - ~GameModeManager(); public: void setMode(GameMode mode); diff --git a/source/server/SocketClient.cpp b/source/server/SocketClient.cpp index 0a0524c..3a6032c 100644 --- a/source/server/SocketClient.cpp +++ b/source/server/SocketClient.cpp @@ -439,6 +439,8 @@ bool SocketClient::tryReconnect() { if (init(sock_ip, port).isSuccess()) { // call init again Logger::log("Reconnect Successful.\n"); return true; + } else { + nn::os::SleepThread(nn::TimeSpan::FromSeconds(1)); } } diff --git a/source/states/StageSceneStateServerConfig.cpp b/source/states/StageSceneStateServerConfig.cpp index b9637f4..544783d 100644 --- a/source/states/StageSceneStateServerConfig.cpp +++ b/source/states/StageSceneStateServerConfig.cpp @@ -91,7 +91,7 @@ StageSceneStateServerConfig::StageSceneStateServerConfig( void StageSceneStateServerConfig::init() { initNerve(&nrvStageSceneStateServerConfigMainMenu, 0); - #ifdef EMU + #if EMU char ryujinx[0x10] = { 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; nn::account::Uid user; nn::account::GetLastOpenedUser(&user);