Personal

.github/workflows/main.yml

@@ -130,7 +130,7 @@ jobs:
     - name: Build 2Ship
       run: |
         export PATH="/usr/lib/ccache:/opt/homebrew/opt/ccache/libexec:/usr/local/opt/ccache/libexec:$PATH"
-        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
+        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DBUILD_NETWORKING=1 -DINCLUDE_MPQ_SUPPORT=1
         cmake --build build-cmake --config Release --parallel 10
         (cd build-cmake && cpack)
 
@@ -207,6 +207,18 @@ jobs:
         cmake ..
         make
         sudo make install
+    - name: Install latest SDL_net
+      run: |
+        export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
+        if [ ! -d "SDL2_net-2.2.0" ]; then
+          wget https://www.libsdl.org/projects/SDL_net/release/SDL2_net-2.2.0.tar.gz
+          tar -xzf SDL2_net-2.2.0.tar.gz
+        fi
+        cd SDL2_net-2.2.0
+        ./configure
+        make -j 10
+        sudo make install
+        sudo cp -av /usr/local/lib/libSDL* /lib/x86_64-linux-gnu/
     - name: Install libzip without crypto
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
@@ -229,7 +241,7 @@ jobs:
     - name: Build 2Ship
       run: |
         export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
-        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=1
+        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_REMOTE_CONTROL=1 -DBUILD_NETWORKING=1 -DINCLUDE_MPQ_SUPPORT=1
         cmake --build build-cmake --config Release -j3
         (cd build-cmake && cpack -G External)
 
@@ -296,7 +308,7 @@ jobs:
         VCPKG_ROOT: ${{github.workspace}}/vcpkg
       run: |
         set $env:PATH="$env:USERPROFILE/.cargo/bin;$env:PATH"
-        cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache
+        cmake -S . -B build-windows -G Ninja -DCMAKE_MAKE_PROGRAM=ninja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DBUILD_NETWORKING=1 -DINCLUDE_MPQ_SUPPORT=1
         cmake --build build-windows --config Release --parallel 10
 
         (cd build-windows && cpack)

CMake/FindOpusFile.cmake

@@ -10,6 +10,7 @@
 find_path(OPUSFILE_INCLUDE_DIR
     NAMES opusfile.h
     PATHS /usr/include/opus /usr/local/include/opus /opt/local/include/opus /opt/homebrew/include/opus
+    PATH_SUFFIXES "opus/"
     DOC "Directory where opusfile.h is located"
 )
 

CMake/lus-cvars.cmake

@@ -1,7 +1,5 @@
 set(CVAR_VSYNC_ENABLED "${CVAR_PREFIX_SETTING}.VsyncEnabled")
 set(CVAR_Z_FIGHTING_MODE "${CVAR_PREFIX_SETTING}.ZFightingMode")
-set(CVAR_NEW_FILE_DROPPED "${CVAR_PREFIX_GENERAL}.NewFileDropped")
-set(CVAR_DROPPED_FILE "${CVAR_PREFIX_GENERAL}.DroppedFile")
 set(CVAR_INTERNAL_RESOLUTION "${CVAR_PREFIX_SETTING}.InternalResolution")
 set(CVAR_MSAA_VALUE "${CVAR_PREFIX_SETTING}.MSAAValue")
 set(CVAR_SDL_WINDOWED_FULLSCREEN "${CVAR_PREFIX_SETTING}.SdlWindowedFullscreen")

CMakeLists.txt

@@ -5,10 +5,10 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
 set(GAME_STR "MM")
-project(2s2h VERSION 1.1.2 LANGUAGES C CXX)
+project(2s2h VERSION 2.0.0 LANGUAGES C CXX)
 include(CMake/2ship-cvars.cmake)
 include(CMake/lus-cvars.cmake)
-set(PROJECT_BUILD_NAME "Satoko Charlie" CACHE STRING "" FORCE)
+set(PROJECT_BUILD_NAME "Rena Alfa" CACHE STRING "" FORCE)
 set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "" FORCE)
 
 execute_process(
@@ -56,12 +56,6 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     endif()
 endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Windows|Linux")
-    if(NOT DEFINED BUILD_CROWD_CONTROL)
-        set(BUILD_CROWD_CONTROL OFF)
-    endif()
-endif()
-
 # Enable the Gfx debugger in LUS to use libgfxd from ZAPDTR
 set(GFX_DEBUG_DISASSEMBLER ON)
 
@@ -107,20 +101,21 @@ endif()
 # Global configuration types
 ################################################################################
 if (CMAKE_SYSTEM_NAME STREQUAL "NintendoSwitch")
-    set(CMAKE_C_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
-    set(CMAKE_CXX_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
-    set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
+    set(CMAKE_C_FLAGS_DEBUG "-g -ffast-math -DDEBUG -fPIE")
+    set(CMAKE_CXX_FLAGS_DEBUG "-g -ffast-math -DDEBUG -fPIE")
+    set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG -fPIE")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG -fPIE")
 elseif(MSVC)
     # We need to remove RTC1 as it is not compatible with O2, which we set for some files in DEBUG
     string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
     string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
     set(CMAKE_C_FLAGS_RELEASE "/O2 /DNDEBUG")
     set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG")
 else()
-    set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
-    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-    set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+    set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -fPIE")
+    set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -fPIE")
+    set(CMAKE_EXE_LINKER_FLAGS "-pie")
+    set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG -fPIE")
 endif()
 
 if(NOT CMAKE_BUILD_TYPE )

README.md

@@ -51,7 +51,13 @@ Congratulations, you are now sailing with 2 Ship 2 Harkinian! Have fun!
 | Ctrl+R | Reset |
 
 ### Graphics Backends
-Currently, there are three rendering APIs supported: DirectX11 (Windows), OpenGL (all platforms), and Metal (macOS). You can change which API to use in the `Settings` menu of the menubar, which requires a restart.  If you're having an issue with crashing, you can change the API in the `2ship2harkinian.json` file by finding the line `"Backend":{`... and changing the `id` value to `3` and set the `Name` to `OpenGL`. `DirectX 11` with id `2` is the default on Windows. `Metal` with id `4` is the default on macOS.
+Currently, there are three rendering APIs supported: DirectX 11 (Windows), OpenGL (all platforms), and Metal (macOS). You can change which API to use in the `Settings` menu of the menubar, which requires a restart.
+
+If you're having an issue with crashing, you can also change the API manually in the `2ship2harkinian.json` file by finding the `"Backend": {` section and updating the backend ID and name. Be sure to use one of the valid values:
+
+- `0` = DirectX 11 (default on Windows)
+- `1` = OpenGL
+- `2` = Metal (default on macOS)
 
 # Custom Assets
 

mm/2s2h/BenGui/BenGui.cpp

@@ -11,7 +11,7 @@
 #include "2s2h/Rando/CheckTracker/CheckTracker.h"
 
 #ifdef __APPLE__
-#include "graphic/Fast3D/gfx_metal.h"
+#include "graphic/Fast3D/backends/gfx_metal.h"
 #endif
 
 #ifdef __SWITCH__
@@ -57,6 +57,10 @@ std::shared_ptr<ItemTrackerWindow> mItemTrackerWindow;
 std::shared_ptr<ItemTrackerSettingsWindow> mItemTrackerSettingsWindow;
 std::shared_ptr<DisplayOverlayWindow> mDisplayOverlayWindow;
 
+UIWidgets::Colors GetMenuThemeColor() {
+    return mBenMenu->GetMenuThemeColor();
+}
+
 void SetupGuiElements() {
     auto gui = Ship::Context::GetInstance()->GetWindow()->GetGui();
 
@@ -73,6 +77,7 @@ void SetupGuiElements() {
         gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press - to access enhancements menu");
 #else
         gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F1 to access enhancements menu");
+        gui->GetGameOverlay()->TextDrawNotification(30.0f, true, "Press F2 to toggle mouse cursor");
 #endif
     }
 

mm/2s2h/BenGui/BenGui.hpp

@@ -1,11 +1,16 @@
 #ifndef BenGui_hpp
 #define BenGui_hpp
 
+#include <BenGui/UIWidgets.hpp>
+
 namespace BenGui {
     void SetupHooks();
     void SetupGuiElements();
     void Draw();
     void Destroy();
+    UIWidgets::Colors GetMenuThemeColor();
 }
 
+#define THEME_COLOR BenGui::GetMenuThemeColor()
+
 #endif /* BenGui_hpp */

mm/2s2h/BenGui/BenInputEditorWindow.cpp

@@ -2,6 +2,7 @@
 #include <Context.h>
 #include "public/bridge/consolevariablebridge.h"
 #include "controller/controldevice/controller/mapping/ControllerRumbleMapping.h"
+#include "controller/controldeck/ControlDeck.h"
 #include "utils/StringHelper.h"
 #ifndef __WIIU__
 #include "controller/controldevice/controller/mapping/sdl/SDLAxisDirectionToButtonMapping.h"