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

-fixed codedump on game boot/exit if no banner was playing

Browse Source 
before
This commit is contained in:
fix94.1 2012-07-03 17:33:24 +00:00
parent 686c3e8726
commit b7e4646985
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/banner/AnimatedBanner.cpp
View File

@ -29,19 +29,20 @@ distribution.
#include "lz77.h" #include "lz77.h"
#include "ash.h" #include "ash.h"
AnimatedBanner::AnimatedBanner(u8 *font1, u8 *font2) AnimatedBanner::AnimatedBanner()
{ {
first = true;
layout_banner = NULL; layout_banner = NULL;
newBanner = NULL; newBanner = NULL;
}
void AnimatedBanner::LoadFont(u8 *font1, u8 *font2)
{
sysFont1 = font1; sysFont1 = font1;
sysFont2 = font2; sysFont2 = font2;
} }
void AnimatedBanner::Clear() void AnimatedBanner::Clear()
{ {
if(first)
return;
if(layout_banner) if(layout_banner)
{ {
delete layout_banner; delete layout_banner;
@ -56,9 +57,7 @@ void AnimatedBanner::Clear()
bool AnimatedBanner::LoadBanner(Banner *banner) bool AnimatedBanner::LoadBanner(Banner *banner)
{ {
first = false;
Clear(); Clear();
u32 banner_bin_size; u32 banner_bin_size;
const u8 *banner_bin = banner->GetFile((char*)"banner.bin", &banner_bin_size); const u8 *banner_bin = banner->GetFile((char*)"banner.bin", &banner_bin_size);
if(banner_bin == NULL) if(banner_bin == NULL)

4
source/banner/AnimatedBanner.h
View File

@ -32,7 +32,8 @@ distribution.
class AnimatedBanner class AnimatedBanner
{ {
public: public:
AnimatedBanner(u8 *font1, u8 *font2); AnimatedBanner();
void LoadFont(u8 *font1, u8 *font2);
void Clear(); void Clear();
bool LoadBanner(Banner *banner); bool LoadBanner(Banner *banner);
@ -45,7 +46,6 @@ protected:
u8 *newBanner; u8 *newBanner;
u8 *sysFont1; u8 *sysFont1;
u8 *sysFont2; u8 *sysFont2;
bool first;
}; };
#endif #endif

8
source/banner/BannerWindow.cpp
View File

@ -55,17 +55,13 @@ BannerWindow::BannerWindow()
{ {
AnimStep = 20; AnimStep = 20;
gameSelected = 0; gameSelected = 0;
firstRun = true; gameBanner = new AnimatedBanner;
} }
void BannerWindow::ChangeGame(Banner *banner) void BannerWindow::ChangeGame(Banner *banner)
{ {
gameSelected = 0; gameSelected = 0;
if(firstRun) gameBanner->LoadFont(sysFont1, sysFont2);
{
gameBanner = new AnimatedBanner(sysFont1, sysFont2);
firstRun = false;
}
gameBanner->LoadBanner(banner); gameBanner->LoadBanner(banner);
} }

1
source/banner/BannerWindow.hpp
View File

@ -64,7 +64,6 @@ class BannerWindow
bool AnimZoomOut; bool AnimZoomOut;
bool AnimationRunning; bool AnimationRunning;
bool oldAnimationRunning; bool oldAnimationRunning;
bool firstRun;
u8 BGAlpha; u8 BGAlpha;
u8 BannerAlpha; u8 BannerAlpha;