diff --git a/projects/mtg/Makefile b/projects/mtg/Makefile index c7c89b5f5..aaee18173 100644 --- a/projects/mtg/Makefile +++ b/projects/mtg/Makefile @@ -30,8 +30,10 @@ BUILD_PRX = 1 LIBS = -ljge300 -lhgetools -lfreetype -ljpeg -lgif -lpng -lz -lm -lmikmod -lpsppower -lpspmpeg -lpspaudiocodec -lpspaudiolib -lpspaudio -lpspmp3 -lpspgum -lpspgu -lpsprtc -lstdc++ -lpspfpu EXTRA_TARGETS = EBOOT.PBP -PSP_EBOOT_TITLE = WTH?! +PSP_EBOOT_TITLE = Wagic, the Homebrew?! PSP_EBOOT_ICON = icon.png +PSP_EBOOT_UNKPNG = NULL +PSP_EBOOT_PIC1 = pic1.png CXXFLAGS = -O2 -G0 -Wall -Werror -DDEVHOOK -DPSPFW3XX -fno-exceptions INCDIR = ../../JGE/include ../../JGE/include/psp ../../JGE/include/psp/freetype2 ../../JGE/src LIBDIR = ../../JGE/lib/psp diff --git a/projects/mtg/bin/Res/graphics/f3.png b/projects/mtg/bin/Res/graphics/f3.png index 7eb56fe43..3d116735d 100644 Binary files a/projects/mtg/bin/Res/graphics/f3.png and b/projects/mtg/bin/Res/graphics/f3.png differ diff --git a/projects/mtg/src/Credits.cpp b/projects/mtg/src/Credits.cpp index aca53f361..5ccb6b5c8 100644 --- a/projects/mtg/src/Credits.cpp +++ b/projects/mtg/src/Credits.cpp @@ -120,7 +120,7 @@ void Credits::compute(Player * _p1, Player * _p2, GameApp * _app){ PlayerData * playerdata = NEW PlayerData(app->collection); playerdata->credits+= value; playerdata->save(); - delete playerdata; + SAFE_DELETE(playerdata); }else{ unlocked = 0; diff --git a/projects/mtg/src/GameStateOptions.cpp b/projects/mtg/src/GameStateOptions.cpp index 878c887ab..acf3b5fb1 100644 --- a/projects/mtg/src/GameStateOptions.cpp +++ b/projects/mtg/src/GameStateOptions.cpp @@ -77,9 +77,7 @@ void GameStateOptions::End() void GameStateOptions::Update(float dt) { - - if(optionsTabs->isTab("Credits")) - timer += dt; + timer += dt; if(options.keypadActive()){ options.keypadUpdate(dt); @@ -115,8 +113,7 @@ void GameStateOptions::Render() //Erase JRenderer::GetInstance()->ClearScreen(ARGB(0,0,0,0)); - if(optionsTabs->isTab("Credits")){ - const char * const CreditsText[] = { + const char * const CreditsText[] = { "Wagic, The Homebrew?! by WilLoW", "", "updates, new cards, and more on http://wololo.net/wagic", @@ -135,24 +132,25 @@ void GameStateOptions::Render() "Please support this project with donations at http://wololo.net/wagic", }; - JLBFont * mFont = resources.GetJLBFont("magic"); - mFont->SetColor(ARGB(255,200,200,200)); - mFont->SetScale(1.0); - float startpos = 272 - timer * 10; - float pos = startpos; - int size = sizeof(CreditsText) / sizeof(CreditsText[0]); - - for (int i = 0; i < size; i++){ - pos = startpos +20*i; - if (pos > -20){ - mFont->DrawString(_(CreditsText[i]).c_str(),SCREEN_WIDTH/2,pos ,JGETEXT_CENTER); - } + JLBFont * mFont = resources.GetJLBFont("magic"); + mFont->SetColor(ARGB(255,200,200,200)); + mFont->SetScale(1.0); + float startpos = 272 - timer * 10; + float pos = startpos; + int size = sizeof(CreditsText) / sizeof(CreditsText[0]); + + for (int i = 0; i < size; i++){ + pos = startpos +20*i; + if (pos > -20){ + mFont->DrawString(_(CreditsText[i]).c_str(),SCREEN_WIDTH/2,pos ,JGETEXT_CENTER); } - - if (pos < -20) timer = 0; - mFont->SetScale(1.f); } + if (pos < -20) + timer = 0; + + mFont->SetScale(1.f); + optionsTabs->Render(); switch(mState){