mirror of
https://github.com/HarbourMasters/Shipwright.git
synced 2024-12-18 06:12:20 -05:00
9bed5af33b
* Remove unused headers * Move all "ResourceMgr_" functions to a new file * Don't transitively include SaveManager * Move cvar prefixes to a new header * Add missing includes * Update OTRGlobals.cpp * Fix build * Address review * Fix some of the errors * Update gameplaystats.h * Update z_en_in.c * Hopefully fix the linux issues * Fix Linux issues for real this time, I checked * Update ResourceManagerHelpers.cpp * Update z_obj_mure2.c * Post-merge fixes * Fix build (hopefully) * Post-merge fixes * Update z_file_nameset_PAL.c * cleanup some unnecessary headers (#7) --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
93 lines
3.6 KiB
C++
93 lines
3.6 KiB
C++
#include "OTRGlobals.h"
|
|
#include "ResourceManagerHelpers.h"
|
|
#include <libultraship/libultraship.h>
|
|
#include "soh/resource/type/Scene.h"
|
|
#include <utils/StringHelper.h>
|
|
#include "soh/Enhancements/game-interactor/GameInteractor.h"
|
|
#include "global.h"
|
|
#include "vt.h"
|
|
#include <Vertex.h>
|
|
|
|
extern "C" void Play_InitScene(PlayState * play, s32 spawn);
|
|
extern "C" void Play_InitEnvironment(PlayState * play, s16 skyboxId);
|
|
void OTRPlay_InitScene(PlayState* play, s32 spawn);
|
|
s32 OTRScene_ExecuteCommands(PlayState* play, SOH::Scene* scene);
|
|
|
|
//LUS::OTRResource* OTRPlay_LoadFile(PlayState* play, RomFile* file) {
|
|
Ship::IResource* OTRPlay_LoadFile(PlayState* play, const char* fileName)
|
|
{
|
|
auto res = Ship::Context::GetInstance()->GetResourceManager()->LoadResource(fileName);
|
|
return res.get();
|
|
}
|
|
|
|
extern "C" void OTRPlay_SpawnScene(PlayState* play, s32 sceneId, s32 spawn) {
|
|
SceneTableEntry* scene = &gSceneTable[sceneId];
|
|
|
|
scene->unk_13 = 0;
|
|
play->loadedScene = scene;
|
|
play->sceneNum = sceneId;
|
|
play->sceneConfig = scene->config;
|
|
|
|
//osSyncPrintf("\nSCENE SIZE %fK\n", (scene->sceneFile.vromEnd - scene->sceneFile.vromStart) / 1024.0f);
|
|
|
|
// Scenes considered "dungeon" with a MQ variant
|
|
int16_t inNonSharedScene = (sceneId >= SCENE_DEKU_TREE && sceneId <= SCENE_ICE_CAVERN) ||
|
|
sceneId == SCENE_GERUDO_TRAINING_GROUND || sceneId == SCENE_INSIDE_GANONS_CASTLE;
|
|
|
|
std::string sceneVersion = "shared";
|
|
if (inNonSharedScene) {
|
|
sceneVersion = ResourceMgr_IsGameMasterQuest() ? "mq" : "nonmq";
|
|
}
|
|
std::string scenePath = StringHelper::Sprintf("scenes/%s/%s/%s", sceneVersion.c_str(), scene->sceneFile.fileName, scene->sceneFile.fileName);
|
|
|
|
play->sceneSegment = OTRPlay_LoadFile(play, scenePath.c_str());
|
|
|
|
// Failed to load scene... default to doodongs cavern
|
|
if (play->sceneSegment == nullptr)
|
|
{
|
|
lusprintf(__FILE__, __LINE__, 2, "Unable to load scene %s... Defaulting to Doodong's Cavern!\n",
|
|
scenePath.c_str());
|
|
OTRPlay_SpawnScene(play, 0x01, 0);
|
|
return;
|
|
}
|
|
|
|
scene->unk_13 = 0;
|
|
|
|
//gSegments[2] = VIRTUAL_TO_PHYSICAL(play->sceneSegment);
|
|
|
|
OTRPlay_InitScene(play, spawn);
|
|
auto roomSize = func_80096FE8(play, &play->roomCtx);
|
|
|
|
osSyncPrintf("ROOM SIZE=%fK\n", roomSize / 1024.0f);
|
|
|
|
GameInteractor::Instance->ExecuteHooks<GameInteractor::OnSceneInit>(play->sceneNum);
|
|
SPDLOG_INFO("Scene Init - sceneNum: {0:#x}, entranceIndex: {1:#x}", play->sceneNum, gSaveContext.entranceIndex);
|
|
}
|
|
|
|
void OTRPlay_InitScene(PlayState* play, s32 spawn) {
|
|
play->curSpawn = spawn;
|
|
play->linkActorEntry = nullptr;
|
|
play->unk_11DFC = nullptr;
|
|
play->setupEntranceList = nullptr;
|
|
play->setupExitList = nullptr;
|
|
play->cUpElfMsgs = nullptr;
|
|
play->setupPathList = nullptr;
|
|
play->numSetupActors = 0;
|
|
Object_InitBank(play, &play->objectCtx);
|
|
LightContext_Init(play, &play->lightCtx);
|
|
TransitionActor_InitContext(&play->state, &play->transiActorCtx);
|
|
func_80096FD4(play, &play->roomCtx.curRoom);
|
|
YREG(15) = 0;
|
|
gSaveContext.worldMapArea = 0;
|
|
OTRScene_ExecuteCommands(play, (SOH::Scene*)play->sceneSegment);
|
|
Play_InitEnvironment(play, play->skyboxId);
|
|
/* auto data = static_cast<LUS::Vertex*>(Ship::Context::GetInstance()
|
|
->GetResourceManager()
|
|
->ResourceLoad("object_link_child\\object_link_childVtx_01FE08")
|
|
.get());
|
|
|
|
auto data2 = ResourceMgr_LoadVtxByCRC(0x68d4ea06044e228f);*/
|
|
|
|
volatile int a = 0;
|
|
}
|