mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-26 03:12:18 -05:00
Code Issues Projects Releases Wiki Activity

bump lus

Browse Source
This commit is contained in:
briaguya 2023-03-13 23:45:19 -07:00 committed by GitHub
parent b157cc5a16
commit 356d959b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libultraship

@ -1 +1 @@
Subproject commit 5787c1b3d89ff8d40a52d7405da627d802ca5dce Subproject commit 274ec5e195f40c526f489242c3c2bf66f10eb9af

2
soh/soh/GbiWrap.cpp
View File

@ -13,7 +13,7 @@ void OTRSetFrameDivisor(int divisor);
void OTRGetPixelDepthPrepare(float x, float y); void OTRGetPixelDepthPrepare(float x, float y);
uint16_t OTRGetPixelDepth(float x, float y); uint16_t OTRGetPixelDepth(float x, float y);
int32_t OTRGetLastScancode(); int32_t OTRGetLastScancode();
void ResourceMgr_CacheDirectory(const char* resName); void ResourceMgr_LoadDirectory(const char* resName);
void ResourceMgr_LoadFile(const char* resName); void ResourceMgr_LoadFile(const char* resName);
char* ResourceMgr_LoadFileFromDisk(const char* filePath); char* ResourceMgr_LoadFileFromDisk(const char* filePath);
char* GetResourceDataByName(char* texPath); char* GetResourceDataByName(char* texPath);

8
soh/soh/OTRGlobals.cpp
View File

@ -340,7 +340,7 @@ extern "C" void AudioMgr_CreateNextAudioBuffer(s16* samples, u32 num_samples);
extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len); extern "C" void AudioPlayer_Play(const uint8_t* buf, uint32_t len);
extern "C" int AudioPlayer_Buffered(void); extern "C" int AudioPlayer_Buffered(void);
extern "C" int AudioPlayer_GetDesiredBuffered(void); extern "C" int AudioPlayer_GetDesiredBuffered(void);
extern "C" void ResourceMgr_CacheDirectory(const char* resName); extern "C" void ResourceMgr_LoadDirectory(const char* resName);
extern "C" SequenceData ResourceMgr_LoadSeqByName(const char* path); extern "C" SequenceData ResourceMgr_LoadSeqByName(const char* path);
std::unordered_map<std::string, ExtensionEntry> ExtensionCache; std::unordered_map<std::string, ExtensionEntry> ExtensionCache;
@ -393,7 +393,7 @@ void OTRAudio_Thread() {
extern "C" void OTRAudio_Init() extern "C" void OTRAudio_Init()
{ {
// Precache all our samples, sequences, etc... // Precache all our samples, sequences, etc...
ResourceMgr_CacheDirectory("audio"); ResourceMgr_LoadDirectory("audio");
if (!audio.running) { if (!audio.running) {
audio.running = true; audio.running = true;
@ -866,8 +866,8 @@ extern "C" uint32_t ResourceMgr_IsGameMasterQuest() {
return IsGameMasterQuest(); return IsGameMasterQuest();
} }
extern "C" void ResourceMgr_CacheDirectory(const char* resName) { extern "C" void ResourceMgr_LoadDirectory(const char* resName) {
OTRGlobals::Instance->context->GetResourceManager()->CacheDirectory(resName); OTRGlobals::Instance->context->GetResourceManager()->LoadDirectory(resName);
} }
extern "C" void ResourceMgr_DirtyDirectory(const char* resName) { extern "C" void ResourceMgr_DirtyDirectory(const char* resName) {
OTRGlobals::Instance->context->GetResourceManager()->DirtyDirectory(resName); OTRGlobals::Instance->context->GetResourceManager()->DirtyDirectory(resName);

2
soh/soh/OTRGlobals.h
View File

@ -58,7 +58,7 @@ uint32_t ResourceMgr_GameHasMasterQuest();
uint32_t ResourceMgr_GameHasOriginal(); uint32_t ResourceMgr_GameHasOriginal();
uint32_t ResourceMgr_GetNumGameVersions(); uint32_t ResourceMgr_GetNumGameVersions();
uint32_t ResourceMgr_GetGameVersion(int index); uint32_t ResourceMgr_GetGameVersion(int index);
void ResourceMgr_CacheDirectory(const char* resName); void ResourceMgr_LoadDirectory(const char* resName);
char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize); char** ResourceMgr_ListFiles(const char* searchMask, int* resultSize);
char* GetResourceDataByNameHandlingMQ(const char* path); char* GetResourceDataByNameHandlingMQ(const char* path);
void ResourceMgr_LoadFile(const char* resName); void ResourceMgr_LoadFile(const char* resName);

2
soh/src/overlays/gamestates/ovl_title/z_title.c
View File

@ -309,7 +309,7 @@ void Title_Init(GameState* thisx) {
osSyncPrintf("z_title.c\n"); osSyncPrintf("z_title.c\n");
//ASSERT(this->staticSegment != NULL); //ASSERT(this->staticSegment != NULL);
//ResourceMgr_CacheDirectory("nintendo_rogo_static*"); //ResourceMgr_LoadDirectory("nintendo_rogo_static*");
// Disable vismono // Disable vismono
D_801614B0.a = 0; D_801614B0.a = 0;