Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jeck - Restored credits to all tabs, fixed f3 graphic alignment issues.

Browse Source 
* 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.
This commit is contained in:
wagic.jeck
2009-09-06 21:22:23 +00:00
parent 8771ee7579
commit eef4be363e
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/mtg/Makefile
View File

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

BIN
projects/mtg/bin/Res/graphics/f3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

2
projects/mtg/src/Credits.cpp
View File

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

38
projects/mtg/src/GameStateOptions.cpp
View File

@@ -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){