github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

it builds! also seed generation runs!

Browse source
This commit is contained in:
briaguya 2022-06-03 02:37:02 -04:00
commit 79e4200ddf
11 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libultraship/libultraship/SohImGuiImpl.h
View file

@ -74,7 +74,6 @@ namespace SohImGui {
void DrawMainMenuAndCalculateGameSize(void); void DrawMainMenuAndCalculateGameSize(void);
void GenerateRandomizerImgui();
void DrawFramebufferAndGameInput(void); void DrawFramebufferAndGameInput(void);
void Render(void); void Render(void);
void CancelFrame(void); void CancelFrame(void);

1
soh/soh/Enhancements/randomizer/3drando/item_pool.hpp
View file

@ -4,6 +4,7 @@
#include <cstddef> #include <cstddef>
#include <vector> #include <vector>
#include <stdint.h>
class ItemLocation; class ItemLocation;

2
soh/soh/Enhancements/randomizer/3drando/music.hpp
View file

@ -2,7 +2,7 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include <stdint.h>
namespace Music { namespace Music {
const uint32_t BGM_BASE = 0x1000585; const uint32_t BGM_BASE = 0x1000585;

2
soh/soh/Enhancements/randomizer/3drando/rando_main.cpp
View file

@ -4,7 +4,7 @@
#include "item_location.hpp" #include "item_location.hpp"
#include "location_access.hpp" #include "location_access.hpp"
#include "rando_main.hpp" #include "rando_main.hpp"
#include <soh/Enhancements/randomizer.h> // #include <soh/Enhancements/randomizer.h>
#include <Cvar.h> #include <Cvar.h>
#include <GameSettings.h> #include <GameSettings.h>

1
soh/soh/Enhancements/randomizer/3drando/sound_effects.cpp
View file

@ -1,6 +1,7 @@
#include "sound_effects.hpp" #include "sound_effects.hpp"
#include "settings.hpp" #include "settings.hpp"
#include <cstdlib> #include <cstdlib>
#include <stdint.h>
namespace SFX { namespace SFX {
const std::array<SeqType, SFX_COUNT> seqTypesSFX = { const std::array<SeqType, SFX_COUNT> seqTypesSFX = {

1
soh/soh/Enhancements/randomizer/3drando/sound_effects.hpp
View file

@ -2,6 +2,7 @@
#include <array> #include <array>
#include <vector> #include <vector>
#include <stdint.h>
#define SFX_BASE 0x1000001 #define SFX_BASE 0x1000001
#define SFX_COUNT 1388 #define SFX_COUNT 1388

1
soh/soh/Enhancements/randomizer/3drando/starting_inventory.hpp
View file

@ -3,6 +3,7 @@
#include "keys.hpp" #include "keys.hpp"
#include <vector> #include <vector>
#include <stdint.h>
extern std::vector<uint32_t> StartingInventory; extern std::vector<uint32_t> StartingInventory;
extern uint8_t AdditionalHeartContainers; extern uint8_t AdditionalHeartContainers;

31
soh/soh/Enhancements/randomizer/randomizer.cpp
View file

@ -2056,6 +2056,20 @@ RandomizerCheck Randomizer::GetCheckFromActor(s16 sceneNum, s16 actorId, s16 act
std::thread randoThread; std::thread randoThread;
void GenerateRandomizerImgui() {
CVar_SetS32("gRandoGenerating", 1);
Game::SaveSettings();
RandoMain::GenerateRando();
CVar_SetS32("gRandoGenerating", 0);
Game::SaveSettings();
Game::LoadSettings();
generated = 1;
}
void DrawRandoEditor(bool& open) { void DrawRandoEditor(bool& open) {
if (!open) { if (!open) {
return; return;
@ -2074,7 +2088,7 @@ void DrawRandoEditor(bool& open) {
} }
if (ImGui::Button("Generate")) { if (ImGui::Button("Generate")) {
// GenerateRandomizerImgui(); GenerateRandomizerImgui();
} }
// if (generated) { // if (generated) {
@ -2085,21 +2099,6 @@ void DrawRandoEditor(bool& open) {
ImGui::End(); ImGui::End();
} }
void GenerateRandomizerImgui() {
CVar_SetS32("gRandoGenerating", 1);
Game::SaveSettings();
// WHY CAN'T I FIND THIS??????????????????
RandoMain::GenerateRando();
CVar_SetS32("gRandoGenerating", 0);
Game::SaveSettings();
Game::LoadSettings();
generated = 1;
}
// void EnhancementCheckbox(const char* text, const char* cvarName) // void EnhancementCheckbox(const char* text, const char* cvarName)
// { // {
// bool val = (bool)CVar_GetS32(cvarName, 0); // bool val = (bool)CVar_GetS32(cvarName, 0);

4
soh/soh/Enhancements/randomizer/randomizer.h
View file

@ -3,8 +3,8 @@
#include <unordered_map> #include <unordered_map>
#include <string> #include <string>
#include "../../include/ultra64.h" #include "../../../include/ultra64.h"
#include "../../include/z64item.h" #include "../../../include/z64item.h"
// #include "randomizer/keys.hpp" // #include "randomizer/keys.hpp"
// #include <randomizer/spoiler_log.hpp> // #include <randomizer/spoiler_log.hpp>
#include <randomizerTypes.h> #include <randomizerTypes.h>

2
soh/soh/OTRGlobals.cpp
View file

@ -29,7 +29,7 @@
#include "AudioPlayer.h" #include "AudioPlayer.h"
#include "Enhancements/debugconsole.h" #include "Enhancements/debugconsole.h"
#include "Enhancements/debugger/debugger.h" #include "Enhancements/debugger/debugger.h"
#include "Enhancements/randomizer.h" #include "Enhancements/randomizer/randomizer.h"
#include "soh/frame_interpolation.h" #include "soh/frame_interpolation.h"
#include "Utils/BitConverter.h" #include "Utils/BitConverter.h"
#include "variables.h" #include "variables.h"

2
soh/soh/OTRGlobals.h
View file

@ -7,7 +7,7 @@
#ifdef __cplusplus #ifdef __cplusplus
#include "Enhancements/savestates.h" #include "Enhancements/savestates.h"
#include "Enhancements/randomizer.h" #include "Enhancements/randomizer/randomizer.h"
// #include "randomizer/spoiler_log.hpp" // #include "randomizer/spoiler_log.hpp"
class OTRGlobals class OTRGlobals