Fixed PSP cross compilation issues.
This commit is contained in:
@@ -30,9 +30,9 @@ class JFile {
|
||||
QFile *mpqFile;
|
||||
#endif
|
||||
public:
|
||||
JFile() : mCurrentFileInZip(0),
|
||||
JFile() : mCurrentFileInZip(0)
|
||||
#ifdef QT_CONFIG
|
||||
mpqFile(0)
|
||||
, mpqFile(0)
|
||||
#endif
|
||||
{
|
||||
};
|
||||
|
||||
@@ -116,25 +116,26 @@ bool JGBKFont::Init(const char* engFileName, const char* chnFileName, int fontsi
|
||||
int size;
|
||||
|
||||
JFileSystem *fileSys = JFileSystem::GetInstance();
|
||||
if (!fileSys->OpenFile(engFileName))
|
||||
JFile* jFile = fileSys->OpenFile(engFileName);
|
||||
if (!jFile)
|
||||
return false;
|
||||
|
||||
size = fileSys->GetFileSize();
|
||||
size = fileSys->GetFileSize(jFile);
|
||||
mEngFont = new BYTE[size];
|
||||
|
||||
fileSys->ReadFile(mEngFont, size);
|
||||
fileSys->CloseFile();
|
||||
fileSys->ReadFile(jFile, mEngFont, size);
|
||||
fileSys->CloseFile(jFile);
|
||||
|
||||
|
||||
if (!fileSys->OpenFile(chnFileName))
|
||||
jFile = fileSys->OpenFile(chnFileName);
|
||||
if (!jFile)
|
||||
return false;
|
||||
|
||||
size = fileSys->GetFileSize();
|
||||
size = fileSys->GetFileSize(jFile);
|
||||
|
||||
mChnFont = new BYTE[size];
|
||||
|
||||
fileSys->ReadFile(mChnFont, size);
|
||||
fileSys->CloseFile();
|
||||
fileSys->ReadFile(jFile, mChnFont, size);
|
||||
fileSys->CloseFile(jFile);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user