etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-22 03:55:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Smarter check for texture finding. (#61)

Browse source
This commit is contained in:
Prince Frizzy 2022-04-12 00:24:35 -04:00 committed by GitHub
parent b4f87e7a50
commit 91920ea904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
data/dynos_bin_tex.cpp
View file

@ -9,14 +9,19 @@ extern "C" {
/////////// ///////////
static TexData* LoadTextureFromFile(GfxData *aGfxData, const String& aFile) { static TexData* LoadTextureFromFile(GfxData *aGfxData, const String& aFile) {
// Image file // Image file
String _TexturePath = aFile.SubString(aFile.Find('/') + 1); // Remove the "actors/" SysPath _Filename = fstring("%s/%s.png", aGfxData->mPackFolder.c_str(), aFile.begin());
SysPath _Filename = fstring("%s/%s.png", aGfxData->mPackFolder.c_str(), _TexturePath.begin());
FILE *_File = fopen(_Filename.c_str(), "rb"); FILE *_File = fopen(_Filename.c_str(), "rb");
// Check as if we're an Actor.
if (!_File) { if (!_File) {
PrintError(" ERROR: Unable to open file \"%s\"", _Filename.c_str()); String _TexturePath = aFile.SubString(aFile.Find('/') + 1); // Remove the "actors/"
return NULL; SysPath _ActorFilename = fstring("%s/%s.png", aGfxData->mPackFolder.c_str(), _TexturePath.begin());
_File = fopen(_ActorFilename.c_str(), "rb");
// The file does not exist in either spot!
if (!_File) {
PrintError(" ERROR: Unable to open file at \"%s\" or \"%s\"", _Filename.c_str(), _ActorFilename.c_str());
return NULL;
}
} }
// Texture data // Texture data