The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

-reverted some of xfede's changes to make it compiling again until he fixes everything

Browse Source 
-cleaned up a bit
This commit is contained in:
fix94.1 2012-01-23 21:46:37 +00:00
parent a01941ff5e
commit 08d5f5cd1f
4 changed files with 12 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/gui/boxmesh.cpp
View File

@ -21,7 +21,7 @@ const Vector3D g_boxSize(
#define h(y) ((float)y / 256.0f)
const SMeshVert g_boxMeshQ ATTRIBUTE_ALIGN(32)[] = { // Quads
const SMeshVert g_boxMeshQ[] ATTRIBUTE_ALIGN(32) = { // Quads
// Bordure du bas devant
{ { g_frontCoverBL.x, g_frontCoverBL.y, g_frontCoverBL.z }, CTexCoord(w(0), h(256)) },
{ { g_frontCoverBL.x, g_frontCoverBL.y - g_boxBorderWidth, g_frontCoverBL.z - g_boxBorderWidth }, CTexCoord(w(10), h(256)) },
@ -101,7 +101,7 @@ const SMeshVert g_boxMeshQ ATTRIBUTE_ALIGN(32)[] = { // Quads
{ { g_backCoverBL.x, g_backCoverBL.y - g_boxBorderWidth, g_backCoverBL.z + g_boxBorderWidth }, CTexCoord(w(0), h(0)) }
};
const SMeshVert g_boxMeshT ATTRIBUTE_ALIGN(32)[] = { // Triangles
const SMeshVert g_boxMeshT[] ATTRIBUTE_ALIGN(32) = { // Triangles
// Haut devant
{ { g_frontCoverTR.x, g_frontCoverTR.y, g_frontCoverBL.z }, CTexCoord(w(0), h(16)) },
{ { g_frontCoverTR.x + g_boxBorderWidth, g_frontCoverTR.y, g_frontCoverBL.z - g_boxBorderWidth }, CTexCoord(w(10), h(0)) },
@ -126,7 +126,7 @@ const SMeshVert g_boxMeshT ATTRIBUTE_ALIGN(32)[] = { // Triangles
#undef h
#undef w
const SMeshVert g_flatCoverMesh ATTRIBUTE_ALIGN(32)[] = {
const SMeshVert g_flatCoverMesh[] ATTRIBUTE_ALIGN(32) = {
{ { g_coverBL.x, g_coverBL.y, g_coverBL.z }, CTexCoord(0.f, 1.f) },
{ { g_coverTR.x, g_coverBL.y, g_coverBL.z }, CTexCoord(1.f, 1.f) },
{ { g_coverTR.x, g_coverTR.y, g_coverBL.z }, CTexCoord(1.f, 0.f) },
@ -140,7 +140,7 @@ const CTexCoord g_flatCoverBoxTex[sizeof g_flatCoverMesh / sizeof g_flatCoverMes
CTexCoord(1.46f / 2.76f, 0.f)
};
const SMeshVert g_boxBackCoverMesh ATTRIBUTE_ALIGN(32)[] = {
const SMeshVert g_boxBackCoverMesh[] ATTRIBUTE_ALIGN(32) = {
{ { g_backCoverTR.x, g_backCoverBL.y, g_backCoverBL.z }, CTexCoord(0.f, 1.f) },
{ { g_backCoverBL.x, g_backCoverBL.y, g_backCoverBL.z }, CTexCoord(1.3f / 2.76f, 1.f) },
{ { g_backCoverBL.x, g_backCoverTR.y, g_backCoverBL.z }, CTexCoord(1.3f / 2.76f, 0.f) },
@ -152,7 +152,7 @@ const SMeshVert g_boxBackCoverMesh ATTRIBUTE_ALIGN(32)[] = {
{ { g_backCoverBL.x, g_backCoverBL.y, g_backCoverBL.z }, CTexCoord(1.3f / 2.76f, 1.f) },
};
const SMeshVert g_boxCoverMesh ATTRIBUTE_ALIGN(32)[] = {
const SMeshVert g_boxCoverMesh[] ATTRIBUTE_ALIGN(32) = {
{ { g_frontCoverBL.x, g_frontCoverBL.y, g_frontCoverBL.z }, CTexCoord(1.46f / 2.76f, 1.f) },
{ { g_frontCoverTR.x, g_frontCoverBL.y, g_frontCoverBL.z }, CTexCoord(1.f, 1.f) },
{ { g_frontCoverTR.x, g_frontCoverTR.y, g_frontCoverBL.z }, CTexCoord(1.f, 0.f) },

3
source/loader/disc.c
View File

@ -72,9 +72,6 @@ void __Disc_SetLowMem()
// Fix for Sam & Max (WiiPower)
*(vu32 *)0x80003184 = 0x80000000;
/* Copy disc ID */
memcpy((void *) Online_Check, (void *) Disc_ID, 4);
}
GXRModeObj * __Disc_SelectVMode(u8 videoselected, u64 chantitle)

18
source/menu/menu_config.cpp
View File

@ -58,12 +58,6 @@ void CMenu::_showConfig(void)
m_btnMgr.show(m_configBtnPageM);
m_btnMgr.show(m_configBtnPageP);
if(m_current_view != COVERFLOW_HOMEBREW && m_current_view != COVERFLOW_DML && m_current_view != COVERFLOW_USB)
{
m_btnMgr.show(m_configBtnEmulation);
m_btnMgr.show(m_configLblEmulation);
}
m_btnMgr.show(m_locked ? m_configBtnUnlock : m_configBtnSetCode);
bool disable = m_current_view == COVERFLOW_CHANNEL && m_cfg.getBool("NAND", "disable", true);
@ -82,19 +76,15 @@ void CMenu::_showConfig(void)
m_btnMgr.setText(m_configLblPage, wfmt(L"%i / %i", g_curPage, m_locked ? g_curPage + 1 : CMenu::_nbCfgPages));
bool isON = false;
switch(m_current_view)
if (m_current_view == COVERFLOW_CHANNEL)
{
case COVERFLOW_CHANNEL:
m_btnMgr.show(m_configBtnEmulation);
m_btnMgr.show(m_configLblEmulation);
m_btnMgr.setText(m_configLblEmulation, _t("cfg12", L"NAND Emulation"));
isON = m_cfg.getBool("NAND", "disable", true);
break;
case COVERFLOW_USB:
m_btnMgr.setText(m_configLblEmulation, _t("cfg11", L"USB Saves Emulation"));
isON = !m_cfg.getBool("GAMES", "save_emulation", false);
break;
}
m_btnMgr.setText(m_configBtnEmulation, isON ? _t("off", L"Off") : _t("on", L"On"));
}
}
void CMenu::_config(int page)
{

2
wiiflow.pnproj
View File

File diff suppressed because one or more lines are too long