diff --git a/portlibs/lib/libcustomext2fs.a b/portlibs/lib/libcustomext2fs.a index 943e7b5c..55b70839 100644 Binary files a/portlibs/lib/libcustomext2fs.a and b/portlibs/lib/libcustomext2fs.a differ diff --git a/portlibs/lib/libcustomfat.a b/portlibs/lib/libcustomfat.a index f0db57fc..bad77510 100644 Binary files a/portlibs/lib/libcustomfat.a and b/portlibs/lib/libcustomfat.a differ diff --git a/portlibs/lib/libcustomntfs.a b/portlibs/lib/libcustomntfs.a index ab534c5d..4b418887 100644 Binary files a/portlibs/lib/libcustomntfs.a and b/portlibs/lib/libcustomntfs.a differ diff --git a/portlibs/lib/libfreetype.a b/portlibs/lib/libfreetype.a index e6138313..228aa90c 100644 Binary files a/portlibs/lib/libfreetype.a and b/portlibs/lib/libfreetype.a differ diff --git a/portlibs/lib/libjpeg.a b/portlibs/lib/libjpeg.a index c606528c..dfae9655 100644 Binary files a/portlibs/lib/libjpeg.a and b/portlibs/lib/libjpeg.a differ diff --git a/portlibs/lib/libmodplay.a b/portlibs/lib/libmodplay.a index d02f0108..aa274ecd 100644 Binary files a/portlibs/lib/libmodplay.a and b/portlibs/lib/libmodplay.a differ diff --git a/portlibs/lib/libpng.a b/portlibs/lib/libpng.a index 11cc45f8..5e1f04fd 100644 Binary files a/portlibs/lib/libpng.a and b/portlibs/lib/libpng.a differ diff --git a/portlibs/lib/libpngu.a b/portlibs/lib/libpngu.a index 3812d70d..1bcbf585 100644 Binary files a/portlibs/lib/libpngu.a and b/portlibs/lib/libpngu.a differ diff --git a/portlibs/lib/libvorbisidec.a b/portlibs/lib/libvorbisidec.a index 1d62af71..074ae7b5 100644 Binary files a/portlibs/lib/libvorbisidec.a and b/portlibs/lib/libvorbisidec.a differ diff --git a/portlibs/lib/libvorbisidec.la b/portlibs/lib/libvorbisidec.la deleted file mode 100644 index 7cc69c17..00000000 --- a/portlibs/lib/libvorbisidec.la +++ /dev/null @@ -1,35 +0,0 @@ -# libvorbisidec.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.5.22 (1.1220.2.365 2005/12/18 22:14:06) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='' - -# Names of this library. -library_names='' - -# The name of the static archive. -old_library='libvorbisidec.a' - -# Libraries that this one depends upon. -dependency_libs='' - -# Version information for libvorbisidec. -current=1 -age=0 -revision=2 - -# Is this an already installed library? -installed=no - -# Should we warn about portability when linking against -modules? -shouldnotlink=no - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/c/devkitPro/portlibs/ppc/lib' diff --git a/portlibs/lib/libz.a b/portlibs/lib/libz.a index 13c6c252..cd3991d9 100644 Binary files a/portlibs/lib/libz.a and b/portlibs/lib/libz.a differ diff --git a/source/gui/FreeTypeGX.cpp b/source/gui/FreeTypeGX.cpp index 75068d2d..8e25daad 100644 --- a/source/gui/FreeTypeGX.cpp +++ b/source/gui/FreeTypeGX.cpp @@ -47,11 +47,8 @@ FreeTypeGX::FreeTypeGX(uint8_t textureFormat, uint8_t positionFormat) FreeTypeGX::~FreeTypeGX() { this->unloadFont(); - if (this->ftLibrary != NULL) - { - FT_Done_FreeType(this->ftLibrary); - this->ftLibrary = NULL; - } + FT_Done_Face(this->ftFace); + FT_Done_FreeType(this->ftLibrary); } /** @@ -130,21 +127,13 @@ uint16_t FreeTypeGX::loadFont(const uint8_t* fontBuffer, FT_Long bufferSize, FT_ */ void FreeTypeGX::unloadFont() { - for( std::map::iterator i = this->fontData.begin(); i != this->fontData.end(); i++) - { - if(i->second.glyphDataTexture != NULL) - { - MEM2_free(i->second.glyphDataTexture); - i->second.glyphDataTexture = NULL; - } - } + if(this->fontData.size() == 0) + return; + std::map::iterator itr; + for(itr = this->fontData.begin(); itr != this->fontData.end(); itr++) + MEM2_free(itr->second.glyphDataTexture); this->fontData.clear(); - if (this->ftFace != NULL) - { - FT_Done_Face(this->ftFace); - this->ftFace = NULL; - } } /** diff --git a/source/menu/menu_game.cpp b/source/menu/menu_game.cpp index 01d13de1..d334cd76 100644 --- a/source/menu/menu_game.cpp +++ b/source/menu/menu_game.cpp @@ -1415,8 +1415,8 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme) m_gameBtnAdultOff = _addPicButton(theme, "GAME/ADULTONLY_OFF", texAdultOff, texAdultOffSel, 532, 200, 48, 48); m_gameBtnSettings = _addPicButton(theme, "GAME/SETTINGS_BTN", texSettings, texSettingsSel, 460, 272, 48, 48); m_gameBtnDelete = _addPicButton(theme, "GAME/DELETE_BTN", texDelete, texDeleteSel, 532, 272, 48, 48); - m_gameBtnPlayFull = _addButton(theme, "GAME/PLAY_FULL_BTN", theme.btnFont, L"", 100, 380, 200, 56, theme.btnFontColor); - m_gameBtnBackFull = _addButton(theme, "GAME/BACK_FULL_BTN", theme.btnFont, L"", 340, 380, 200, 56, theme.btnFontColor); + m_gameBtnPlayFull = _addButton(theme, "GAME/PLAY_FULL_BTN", theme.btnFont, L"", 340, 390, 200, 56, theme.btnFontColor); + m_gameBtnBackFull = _addButton(theme, "GAME/BACK_FULL_BTN", theme.btnFont, L"", 100, 390, 200, 56, theme.btnFontColor); m_gameBtnToogle = _addPicButton(theme, "GAME/TOOGLE_BTN", texToogleBanner, texToogleBanner, 385, 31, 236, 127); m_gameBtnToogleFull = _addPicButton(theme, "GAME/TOOGLE_FULL_BTN", texToogleBanner, texToogleBanner, 20, 12, 608, 344);