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

Jeck - Reverting r1183.

Browse Source
This commit is contained in:
wagic.jeck
2009-10-26 05:10:06 +00:00
parent 8a6162ba15
commit eefd03ad84
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/ShopItem.cpp
+1 -6
View File
@@ -248,7 +248,6 @@ void ShopItems::Update(float dt){
}else{ }else{
if (showPriceDialog!=-1){ if (showPriceDialog!=-1){
ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]); ShopItem * item = ((ShopItem *)mObjects[showPriceDialog]);
if(item){
int price = item->price; int price = item->price;
char buffer[4096]; char buffer[4096];
sprintf(buffer,"%s : %i credits",item->getText(),price); sprintf(buffer,"%s : %i credits",item->getText(),price);
@@ -260,9 +259,6 @@ void ShopItems::Update(float dt){
else{ else{
dialog->Update(dt); dialog->Update(dt);
} }
}
else
JGuiController::Update(dt);
}else{ }else{
u32 buttons[] = {PSP_CTRL_LEFT,PSP_CTRL_DOWN,PSP_CTRL_RIGHT,PSP_CTRL_UP,PSP_CTRL_CIRCLE}; u32 buttons[] = {PSP_CTRL_LEFT,PSP_CTRL_DOWN,PSP_CTRL_RIGHT,PSP_CTRL_UP,PSP_CTRL_CIRCLE};
for (int i = 0; i < 5; ++i){ for (int i = 0; i < 5; ++i){
@@ -317,7 +313,6 @@ void ShopItems::Render(){
if(mCurr >= 0){ if(mCurr >= 0){
mFont->SetColor(ARGB(255,255,255,0)); mFont->SetColor(ARGB(255,255,255,0));
ShopItem * item = ((ShopItem *)mObjects[mCurr]); ShopItem * item = ((ShopItem *)mObjects[mCurr]);
if(item)
mFont->DrawString(item->mText.c_str(), SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT - 14,JGETEXT_CENTER); mFont->DrawString(item->mText.c_str(), SCREEN_WIDTH/2 - 50, SCREEN_HEIGHT - 14,JGETEXT_CENTER);
mFont->SetColor(ARGB(255,255,255,255)); mFont->SetColor(ARGB(255,255,255,255));
} }
@@ -331,7 +326,7 @@ void ShopItems::Render(){
if (i == mCurr) mFont->SetColor(ARGB(255,255,255,0)); if (i == mCurr) mFont->SetColor(ARGB(255,255,255,0));
else mFont->SetColor(ARGB(255,255,255,255)); else mFont->SetColor(ARGB(255,255,255,255));
char buffer[512]; char buffer[512];
sprintf(buffer, "%s", s ? s->getText() : "error"); sprintf(buffer, "%s", s->getText());
float x = 300; float x = 300;
float y = 10 + 20*i; float y = 10 + 20*i;
mFont->DrawString(buffer,x,y); mFont->DrawString(buffer,x,y);