PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-01-23 05:25:01 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed hashes and added information box

Browse Source
This commit is contained in:
KiritoDv 2025-01-15 19:36:12 -06:00
parent 4a9a76f945
commit 66db2a9328
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -312,6 +312,7 @@ option(BUILD_STORMLIB "Build with StormLib support" OFF)
option(BUILD_SM64 "Build with Super Mario 64 support" OFF) option(BUILD_SM64 "Build with Super Mario 64 support" OFF)
option(BUILD_MK64 "Build with Mario Kart 64 support" OFF) option(BUILD_MK64 "Build with Mario Kart 64 support" OFF)
option(BUILD_FZERO "Build with F-Zero X support" OFF)
add_subdirectory(tools/Torch) add_subdirectory(tools/Torch)
target_link_libraries(${PROJECT_NAME} PRIVATE torch "${ADDITIONAL_LIBRARY_DEPENDENCIES}") target_link_libraries(${PROJECT_NAME} PRIVATE torch "${ADDITIONAL_LIBRARY_DEPENDENCIES}")

7
src/port/Engine.cpp
View File

@ -41,7 +41,6 @@
#include "port/mods/PortEnhancements.h" #include "port/mods/PortEnhancements.h"
#include <Fast3D/gfx_pc.h> #include <Fast3D/gfx_pc.h>
#include <SDL2/SDL.h>
#include <filesystem> #include <filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
@ -219,7 +218,7 @@ bool GameEngine::GenAssetFile() {
exit(1); exit(1);
} }
ShowMessage(("Found " + game.value()).c_str(), "The extraction process will now begin.\n\nThis may take a few minutes."); ShowMessage(("Found " + game.value()).c_str(), "The extraction process will now begin.\n\nThis may take a few minutes.", SDL_MESSAGEBOX_INFORMATION);
return extractor->GenerateOTR(); return extractor->GenerateOTR();
} }
@ -458,11 +457,11 @@ uint32_t GameEngine::GetInterpolationFPS() {
CVarGetInteger("gInterpolationFPS", 60)); CVarGetInteger("gInterpolationFPS", 60));
} }
void GameEngine::ShowMessage(const char* title, const char* message) { void GameEngine::ShowMessage(const char* title, const char* message, SDL_MessageBoxFlags type) {
#if defined(__SWITCH__) #if defined(__SWITCH__)
SPDLOG_ERROR(message); SPDLOG_ERROR(message);
#else #else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, title, message, nullptr); SDL_ShowSimpleMessageBox(type, title, message, nullptr);
SPDLOG_ERROR(message); SPDLOG_ERROR(message);
#endif #endif
} }

3
src/port/Engine.h
View File

@ -12,6 +12,7 @@ struct GamePool {
#ifdef __cplusplus #ifdef __cplusplus
#include <vector> #include <vector>
#include <SDL2/SDL.h>
#include <Fast3D/gfx_pc.h> #include <Fast3D/gfx_pc.h>
#include "libultraship/src/Context.h" #include "libultraship/src/Context.h"
@ -45,7 +46,7 @@ class GameEngine {
static uint32_t GetInterpolationFPS(); static uint32_t GetInterpolationFPS();
static int ShowYesNoBox(const char* title, const char* box); static int ShowYesNoBox(const char* title, const char* box);
static void ShowMessage(const char* title, const char* message); static void ShowMessage(const char* title, const char* message, SDL_MessageBoxFlags type = SDL_MESSAGEBOX_ERROR);
}; };
extern "C" void* GameEngine_Malloc(size_t size); extern "C" void* GameEngine_Malloc(size_t size);

4
src/port/extractor/GameExtractor.cpp
View File

@ -8,10 +8,10 @@
#include <port/Engine.h> #include <port/Engine.h>
std::unordered_map<std::string, std::string> mGameList = { std::unordered_map<std::string, std::string> mGameList = {
{ "d8b1088520f7c5f81433292a9258c1184afa1457", "Star Fox 64 (U) (V1.1)" }, { "d8b1088520f7c5f81433292a9258c1184afa1457", "Star Fox 64 (U) (V1.0)" },
{ "63b69f0ef36306257481afc250f9bc304c7162b2", "Star Fox 64 (U) (V1.0) (Uncompressed)" }, { "63b69f0ef36306257481afc250f9bc304c7162b2", "Star Fox 64 (U) (V1.0) (Uncompressed)" },
{ "09f0d105f476b00efa5303a3ebc42e60a7753b7a", "Star Fox 64 (U) (V1.1)" }, { "09f0d105f476b00efa5303a3ebc42e60a7753b7a", "Star Fox 64 (U) (V1.1)" },
{ "f7475fb11e7e6830f82883412638e8390791ab87", "Star Fox 64 (U) (V1.0) (Uncompressed)" }, { "f7475fb11e7e6830f82883412638e8390791ab87", "Star Fox 64 (U) (V1.1) (Uncompressed)" },
}; };
bool GameExtractor::SelectGameFromUI() { bool GameExtractor::SelectGameFromUI() {