Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed PSP cross compilation issues.

Browse Source
This commit is contained in:
xawotihs
2013-12-28 01:05:53 +01:00
parent fec4468aea
commit afb4c4605b
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
JGE/include/JFileSystem.h
View File

@@ -30,9 +30,9 @@ class JFile {
QFile *mpqFile; QFile *mpqFile;
#endif #endif
public: public:
JFile() : mCurrentFileInZip(0), JFile() : mCurrentFileInZip(0)
#ifdef QT_CONFIG #ifdef QT_CONFIG
mpqFile(0) , mpqFile(0)
#endif #endif
{ {
}; };

19
JGE/src/JGBKFont.cpp
View File

@@ -116,25 +116,26 @@ bool JGBKFont::Init(const char* engFileName, const char* chnFileName, int fontsi
int size; int size;
JFileSystem *fileSys = JFileSystem::GetInstance(); JFileSystem *fileSys = JFileSystem::GetInstance();
if (!fileSys->OpenFile(engFileName)) JFile* jFile = fileSys->OpenFile(engFileName);
if (!jFile)
return false; return false;
size = fileSys->GetFileSize(); size = fileSys->GetFileSize(jFile);
mEngFont = new BYTE[size]; mEngFont = new BYTE[size];
fileSys->ReadFile(mEngFont, size); fileSys->ReadFile(jFile, mEngFont, size);
fileSys->CloseFile(); fileSys->CloseFile(jFile);
jFile = fileSys->OpenFile(chnFileName);
if (!fileSys->OpenFile(chnFileName)) if (!jFile)
return false; return false;
size = fileSys->GetFileSize(); size = fileSys->GetFileSize(jFile);
mChnFont = new BYTE[size]; mChnFont = new BYTE[size];
fileSys->ReadFile(mChnFont, size); fileSys->ReadFile(jFile, mChnFont, size);
fileSys->CloseFile(); fileSys->CloseFile(jFile);
return true; return true;
} }