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

fix credits

Browse Source
This commit is contained in:
Anthony Calosa
2017-03-09 02:01:08 +08:00
parent 57f55e4270
commit 01d46615a7
4 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -315,6 +315,7 @@ void Credits::compute(GameObserver* g, GameApp * _app)
}
playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
PriceList::updateKey();
playerdata->taskList->passOneDay();
if (playerdata->taskList->getTaskCount() < 6)
@@ -464,6 +465,7 @@ void Credits::computeTournament(GameObserver* g, GameApp * _app,bool tournament,
}
playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
PriceList::updateKey();
playerdata->taskList->passOneDay();
if (playerdata->taskList->getTaskCount() < 6)
@@ -675,6 +677,7 @@ int Credits::addCreditBonus(int value)
{
PlayerData * playerdata = NEW PlayerData();
playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
playerdata->save();
SAFE_DELETE(playerdata);
return value;

1
projects/mtg/src/GameStateDeckViewer.cpp
View File

@@ -1711,6 +1711,7 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
int rnd = (rand() % 25);
int price = pricelist->getSellPrice(card);
playerdata->credits += price;
GameApp::mycredits = playerdata->credits;
price = price - (rnd * price) / 100;
pricelist->setPrice(card->getMTGId(), price);
playerdata->collection->remove(card->getMTGId());

8
projects/mtg/src/GameStateMenu.cpp
View File

@@ -841,19 +841,19 @@ void GameStateMenu::Render()
renderer->RenderQuad(mBg.get(), SCREEN_WIDTH_F/2, 2, 0, 256 / mBg->mWidth, 166 / mBg->mHeight);
RenderTopMenu();
/*
//credits on lower left if available
std::ostringstream streamC;
streamC << "Credits: " << GameApp::mycredits;
mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
mFont->SetScale(1.f);
mFont->SetColor(ARGB(200,248,248,255));
mFont->SetScale(0.9f);
mFont->SetColor(ARGB(150,248,248,255));
mFont->DrawString(streamC.str(), 12, SCREEN_HEIGHT - 16);
mFont->SetColor(ARGB(255,255,255,255));
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);
//end
*/
}
if (subMenuController)
{

8
projects/mtg/src/GameStateShop.cpp
View File

@@ -277,6 +277,7 @@ void GameStateShop::purchaseCard(int controlId)
int price = mPrices[controlId];
pricelist->setPrice(c->getMTGId(), price); // In case they changed their minds after cancelling.
playerdata->credits -= price;
GameApp::mycredits = playerdata->credits;
//Update prices
int rnd;
switch (options[Options::ECON_DIFFICULTY].number)
@@ -304,6 +305,7 @@ void GameStateShop::purchaseBooster(int controlId)
if (playerdata->credits - mPrices[controlId] < 0)
return;
playerdata->credits -= mPrices[controlId];
GameApp::mycredits = playerdata->credits;
mInventory[controlId]--;
SAFE_DELETE(booster);
deleteDisplay();
@@ -819,7 +821,10 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
if (sel > -1 && sel < SHOP_ITEMS)
{
if (controlId == -2)
{
playerdata->credits += mPrices[sel]; //We stole it.
GameApp::mycredits = playerdata->credits;
}
if (sel < BOOSTER_SLOTS) //Clicked a booster.
purchaseBooster(sel);
else
@@ -860,7 +865,10 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
beginFilters();
break;
case -2:
{
playerdata->credits += 2000;
GameApp::mycredits = playerdata->credits;
}
default:
mStage = STAGE_SHOP_SHOP;
}