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
projects/mtg/src/Credits.cpp
+3
View File
@@ -315,6 +315,7 @@ void Credits::compute(GameObserver* g, GameApp * _app)
} }
playerdata->credits += value; playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
PriceList::updateKey(); PriceList::updateKey();
playerdata->taskList->passOneDay(); playerdata->taskList->passOneDay();
if (playerdata->taskList->getTaskCount() < 6) if (playerdata->taskList->getTaskCount() < 6)
@@ -464,6 +465,7 @@ void Credits::computeTournament(GameObserver* g, GameApp * _app,bool tournament,
} }
playerdata->credits += value; playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
PriceList::updateKey(); PriceList::updateKey();
playerdata->taskList->passOneDay(); playerdata->taskList->passOneDay();
if (playerdata->taskList->getTaskCount() < 6) if (playerdata->taskList->getTaskCount() < 6)
@@ -675,6 +677,7 @@ int Credits::addCreditBonus(int value)
{ {
PlayerData * playerdata = NEW PlayerData(); PlayerData * playerdata = NEW PlayerData();
playerdata->credits += value; playerdata->credits += value;
GameApp::mycredits = playerdata->credits;
playerdata->save(); playerdata->save();
SAFE_DELETE(playerdata); SAFE_DELETE(playerdata);
return value; return value;
projects/mtg/src/GameStateDeckViewer.cpp
+1
View File
@@ -1711,6 +1711,7 @@ void GameStateDeckViewer::ButtonPressed(int controllerId, int controlId)
int rnd = (rand() % 25); int rnd = (rand() % 25);
int price = pricelist->getSellPrice(card); int price = pricelist->getSellPrice(card);
playerdata->credits += price; playerdata->credits += price;
GameApp::mycredits = playerdata->credits;
price = price - (rnd * price) / 100; price = price - (rnd * price) / 100;
pricelist->setPrice(card->getMTGId(), price); pricelist->setPrice(card->getMTGId(), price);
playerdata->collection->remove(card->getMTGId()); playerdata->collection->remove(card->getMTGId());
projects/mtg/src/GameStateMenu.cpp
+4 -4
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); renderer->RenderQuad(mBg.get(), SCREEN_WIDTH_F/2, 2, 0, 256 / mBg->mWidth, 166 / mBg->mHeight);
RenderTopMenu(); RenderTopMenu();
/*
//credits on lower left if available //credits on lower left if available
std::ostringstream streamC; std::ostringstream streamC;
streamC << "Credits: " << GameApp::mycredits; streamC << "Credits: " << GameApp::mycredits;
mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT); mFont = WResourceManager::Instance()->GetWFont(Fonts::MAIN_FONT);
mFont->SetScale(1.f); mFont->SetScale(0.9f);
mFont->SetColor(ARGB(200,248,248,255)); mFont->SetColor(ARGB(150,248,248,255));
mFont->DrawString(streamC.str(), 12, SCREEN_HEIGHT - 16); mFont->DrawString(streamC.str(), 12, SCREEN_HEIGHT - 16);
mFont->SetColor(ARGB(255,255,255,255)); mFont->SetColor(ARGB(255,255,255,255));
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT); mFont = WResourceManager::Instance()->GetWFont(Fonts::MENU_FONT);
//end //end
*/
} }
if (subMenuController) if (subMenuController)
{ {
projects/mtg/src/GameStateShop.cpp
+8
View File
@@ -277,6 +277,7 @@ void GameStateShop::purchaseCard(int controlId)
int price = mPrices[controlId]; int price = mPrices[controlId];
pricelist->setPrice(c->getMTGId(), price); // In case they changed their minds after cancelling. pricelist->setPrice(c->getMTGId(), price); // In case they changed their minds after cancelling.
playerdata->credits -= price; playerdata->credits -= price;
GameApp::mycredits = playerdata->credits;
//Update prices //Update prices
int rnd; int rnd;
switch (options[Options::ECON_DIFFICULTY].number) switch (options[Options::ECON_DIFFICULTY].number)
@@ -304,6 +305,7 @@ void GameStateShop::purchaseBooster(int controlId)
if (playerdata->credits - mPrices[controlId] < 0) if (playerdata->credits - mPrices[controlId] < 0)
return; return;
playerdata->credits -= mPrices[controlId]; playerdata->credits -= mPrices[controlId];
GameApp::mycredits = playerdata->credits;
mInventory[controlId]--; mInventory[controlId]--;
SAFE_DELETE(booster); SAFE_DELETE(booster);
deleteDisplay(); deleteDisplay();
@@ -819,7 +821,10 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
if (sel > -1 && sel < SHOP_ITEMS) if (sel > -1 && sel < SHOP_ITEMS)
{ {
if (controlId == -2) if (controlId == -2)
{
playerdata->credits += mPrices[sel]; //We stole it. playerdata->credits += mPrices[sel]; //We stole it.
GameApp::mycredits = playerdata->credits;
}
if (sel < BOOSTER_SLOTS) //Clicked a booster. if (sel < BOOSTER_SLOTS) //Clicked a booster.
purchaseBooster(sel); purchaseBooster(sel);
else else
@@ -860,7 +865,10 @@ void GameStateShop::ButtonPressed(int controllerId, int controlId)
beginFilters(); beginFilters();
break; break;
case -2: case -2:
{
playerdata->credits += 2000; playerdata->credits += 2000;
GameApp::mycredits = playerdata->credits;
}
default: default:
mStage = STAGE_SHOP_SHOP; mStage = STAGE_SHOP_SHOP;
} }