-added SL2J01 to black cover list (thanks lustar)

-fixed a bug on exit wiiflow which made it freezing
This commit is contained in:
fix94.1 2012-07-08 15:41:58 +00:00
parent 47892032f5
commit 1a93cdf4c3
3 changed files with 5 additions and 5 deletions

View File

@ -47,10 +47,10 @@ FreeTypeGX::FreeTypeGX(uint8_t textureFormat, uint8_t positionFormat)
FreeTypeGX::~FreeTypeGX() FreeTypeGX::~FreeTypeGX()
{ {
this->unloadFont(); this->unloadFont();
if (this->ftLibrary != 0) if (this->ftLibrary != NULL)
{ {
FT_Done_FreeType(this->ftLibrary); FT_Done_FreeType(this->ftLibrary);
this->ftLibrary = 0; this->ftLibrary = NULL;
} }
} }

View File

@ -28,8 +28,8 @@ extern const u8 loading_png[];
extern const u8 flatnopic_png[]; extern const u8 flatnopic_png[];
extern const u8 flatloading_png[]; extern const u8 flatloading_png[];
static const int black_len = 15; static const int black_len = 16;
static const char* black[black_len] = {"RZZJEL","RZNJ01","SEKJ99","SX3J01","SX3P01","R5WJA4","RUYJ99","S3HJ08","SJBJ01","CKBE88","CCPE01","SMMP01","MDUE01","APR","AFR"}; static const char* black[black_len] = {"RZZJEL","RZNJ01","SEKJ99","SX3J01","SX3P01","R5WJA4","RUYJ99","S3HJ08","SJBJ01","CKBE88","CCPE01","SMMP01","MDUE01","SL2J01","APR","AFR"};
static const int red_len = 2; static const int red_len = 2;
static const char* red[red_len] = {"SMN","HBW"}; static const char* red[red_len] = {"SMN","HBW"};

View File

@ -25,7 +25,7 @@ public:
bool fromBuffer(const SmartBuf &buffer, u32 bufferSize, u32 size, u32 lspacing, u32 w = 0, u32 idx = 0, const char *genKey = NULL); bool fromBuffer(const SmartBuf &buffer, u32 bufferSize, u32 size, u32 lspacing, u32 w = 0, u32 idx = 0, const char *genKey = NULL);
bool fromFile(const char *filename, u32 size, u32 lspacing, u32 w = 0, u32 idx = 0); bool fromFile(const char *filename, u32 size, u32 lspacing, u32 w = 0, u32 idx = 0);
SFont(void) : data(SmartBuf(NULL, SmartBuf::SRCALL_MEM2)), dataSize(0), font(SmartPtr<FreeTypeGX>(new FreeTypeGX)), lineSpacing(0), weight(0), index(0) { } SFont(void) : data(SmartBuf(NULL, SmartBuf::SRCALL_MEM2)), dataSize(0), font(SmartPtr<FreeTypeGX>(new FreeTypeGX)), lineSpacing(0), weight(0), index(0) { }
~SFont(void) { } ~SFont(void) { font.release(); }
}; };
class CText class CText