Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'level-scripts' of github.com:sm64ex-coop-dev/sm64ex-coop into level-scripts

This commit is contained in:
MysterD 2022-04-11 22:14:20 -07:00
parent a925acba6b 91920ea904
commit e037e3b65e
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) {
// Image file
String _TexturePath = aFile.SubString(aFile.Find('/') + 1); // Remove the "actors/"
SysPath _Filename = fstring("%s/%s.png", aGfxData->mPackFolder.c_str(), _TexturePath.begin());
SysPath _Filename = fstring("%s/%s.png", aGfxData->mPackFolder.c_str(), aFile.begin());
FILE *_File = fopen(_Filename.c_str(), "rb");
// Check as if we're an Actor.
if (!_File) {
PrintError(" ERROR: Unable to open file \"%s\"", _Filename.c_str());
return NULL;
String _TexturePath = aFile.SubString(aFile.Find('/') + 1); // Remove the "actors/"
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