From eef4be363ee3b9fb984473c5259d85722d4a12dc Mon Sep 17 00:00:00 2001 From: "wagic.jeck" Date: Sun, 6 Sep 2009 21:22:23 +0000 Subject: [PATCH] Jeck - Restored credits to all tabs, fixed f3 graphic alignment issues. * F3 font had an issue where the j and y dangled into the characters below them. I fixed this by shifting all characters one pixel up, but this does change the way f3 fits when rendered. The alternative would be just to clip the dangling pixels off entirely. --- projects/mtg/Makefile | 4 ++- projects/mtg/bin/Res/graphics/f3.png | Bin 7507 -> 10064 bytes projects/mtg/src/Credits.cpp | 2 +- projects/mtg/src/GameStateOptions.cpp | 38 ++++++++++++-------------- 4 files changed, 22 insertions(+), 22 deletions(-) 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 7eb56fe43e5435ab9c71e2c1ea29303b0c5fbcd5..3d116735db57d2714475e6e473372aa394982ef5 100644 GIT binary patch literal 10064 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%0ABSV3vmmiZmS-y7Zh>0d5K$zD$U(tn# zL%EcPFhnM8=A&v7R#+)rwcoI+l;@zJx@eN+(c`9y@CW145pITn|OX2 zG*5|%i|;CZV3mvhT>ZG}Yo8gq-p zI%%nli>vjl?TdDX>6fAITwsls$+RNy&eiIVU~N4HeYZEk@`dWoX|bY)gj3M0GW?%L zfZ5jXyw{q|b0H+-<}PxXyZ&Bv``ZRnO3Sg)nHU>0A#@Tle&Op4dY0Pmkt!`HDi@q@ zyRlQ;+L%hG(stV!A@qte6%tW|;NdrnBt0ggML2Bk;zRy#-f-!8Ok&ZF_m>D7bEL6R zWqM2^^-*#12N$x^6FEZxMihKgjc4HX=D(d(;D?9Zb2v>zPUN1oI8EuH-~2C(b7^|& zbs}-ZWfHO%0Lu~gSxpUmyp>1x0&Z_xv3!*^$p`Nq9v*bb(1_6Ei_4mY$2SG^>@%f! z<$_(iZsn{Ei^cqJe*2z|-osA{N=g_R7rZA!kmJ=O;@%8BfrgL(ki%&~9>D*nWdxBJ z7GOC=TmnF-+f!NsC^PVUulngm3_W`LJuz?D3;OiL5P`wJ$ZDe;rNJuEUy1M$(rlFS^ z01n%q<^FjxA2H}7;7kVt5K9nK(VupolYHa}mQ9r)A3Qid#v8#0tZI>7lGgo)RR2HQ hTL1G65WLfF5YXvJQ*9?Khl;!gD9WnIR7+U||1Z>!`6mDX literal 7507 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 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){