-switched back and play button in fullscreen banner

and set both a bit down
-changed a few little things about freetypegx unload
-since I dont care about size anymore the libs are now 
in its original size again, makes wiiflow bigger but better
to handle
This commit is contained in:
fix94.1 2012-07-10 16:38:21 +00:00
parent 3aa8dde58d
commit a9a184c84a
13 changed files with 9 additions and 55 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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'

Binary file not shown.

View File

@ -47,11 +47,8 @@ FreeTypeGX::FreeTypeGX(uint8_t textureFormat, uint8_t positionFormat)
FreeTypeGX::~FreeTypeGX() FreeTypeGX::~FreeTypeGX()
{ {
this->unloadFont(); this->unloadFont();
if (this->ftLibrary != NULL) FT_Done_Face(this->ftFace);
{ FT_Done_FreeType(this->ftLibrary);
FT_Done_FreeType(this->ftLibrary);
this->ftLibrary = NULL;
}
} }
/** /**
@ -130,21 +127,13 @@ uint16_t FreeTypeGX::loadFont(const uint8_t* fontBuffer, FT_Long bufferSize, FT_
*/ */
void FreeTypeGX::unloadFont() void FreeTypeGX::unloadFont()
{ {
for( std::map<wchar_t, ftgxCharData>::iterator i = this->fontData.begin(); i != this->fontData.end(); i++) if(this->fontData.size() == 0)
{ return;
if(i->second.glyphDataTexture != NULL)
{
MEM2_free(i->second.glyphDataTexture);
i->second.glyphDataTexture = NULL;
}
}
std::map<wchar_t, ftgxCharData>::iterator itr;
for(itr = this->fontData.begin(); itr != this->fontData.end(); itr++)
MEM2_free(itr->second.glyphDataTexture);
this->fontData.clear(); this->fontData.clear();
if (this->ftFace != NULL)
{
FT_Done_Face(this->ftFace);
this->ftFace = NULL;
}
} }
/** /**

View File

@ -1415,8 +1415,8 @@ void CMenu::_initGameMenu(CMenu::SThemeData &theme)
m_gameBtnAdultOff = _addPicButton(theme, "GAME/ADULTONLY_OFF", texAdultOff, texAdultOffSel, 532, 200, 48, 48); 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_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_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_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"", 340, 380, 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_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); m_gameBtnToogleFull = _addPicButton(theme, "GAME/TOOGLE_FULL_BTN", texToogleBanner, texToogleBanner, 20, 12, 608, 344);