diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index 8be6906b6..f1dc60e63 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -490,8 +490,8 @@ int AIPlayer::chooseBlockers(){ } int AIPlayer::orderBlockers(){ - GameObserver * g = GameObserver::GetInstance(); /* + GameObserver * g = GameObserver::GetInstance(); DamageResolverLayer * drl = g->mLayers->combatLayer(); if (drl->orderingIsNeeded && g->currentPlayer==this){ drl->blockersOrderingDone(); //TODO clever rank of blockers @@ -504,7 +504,7 @@ int AIPlayer::orderBlockers(){ int AIPlayer::combatDamages(){ - int result = 0; + //int result = 0; GameObserver * gameObs = GameObserver::GetInstance(); int currentGamePhase = gameObs->getCurrentGamePhase(); diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index d54fa578e..06978640a 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -214,7 +214,8 @@ void Spell::Render(){ else { MTGCard * mtgcard = source->model; - // CardGui::alternateRender(mtgcard, NULL, 10 + 90 , 20 + 130, 0.0f,0.9f); + Pos pos = Pos(10 + 90, 20 + 130, 0.9f, 0.0, 255); + CardGui::alternateRender(mtgcard, pos); quad = cache.getThumb(source); if (quad){ diff --git a/projects/mtg/src/CardDisplay.cpp b/projects/mtg/src/CardDisplay.cpp index e135b6c7c..233962f84 100644 --- a/projects/mtg/src/CardDisplay.cpp +++ b/projects/mtg/src/CardDisplay.cpp @@ -139,7 +139,8 @@ void CardDisplay::Render(){ if (mCount && mObjects[mCurr] != NULL){ mObjects[mCurr]->Render(); - CardGui * cardg = ((CardGui *)mObjects[mCurr]); + //TODO Put these two lines back!!! + // CardGui * cardg = ((CardGui *)mObjects[mCurr]); // cardg->RenderBig(-1,-1,showBigCards-1); } } diff --git a/projects/mtg/src/CardGui.cpp b/projects/mtg/src/CardGui.cpp index 46ca7206b..139b97df2 100644 --- a/projects/mtg/src/CardGui.cpp +++ b/projects/mtg/src/CardGui.cpp @@ -48,7 +48,7 @@ void CardView::Render() } else { int color = card->getColor(); - MTGCard * mtgcard = card->model; + //MTGCard * mtgcard = card->model; const float scale = actZ; renderer->RenderQuad(GameApp::CommonRes->GetQuad("shadow"), actX + (scale-1)*15, actY + (scale-1)*15, actT, 28*scale, 40*scale); @@ -71,7 +71,7 @@ void CardView::Render() { JQuad* q; // Draw the "unknown" card model - switch(card->getColor()) + switch(color) { case Constants::MTG_COLOR_GREEN: q = GameApp::CommonRes->GetQuad("green_thumb"); break; case Constants::MTG_COLOR_BLUE : q = GameApp::CommonRes->GetQuad("blue_thumb"); break; @@ -232,7 +232,7 @@ void CardGui::RenderBig(const Pos& pos){ } // If we come here, we do not have the picture. - MTGCard * mtgcard = card->model; + //MTGCard * mtgcard = card->model; alternateRender(card,pos); } diff --git a/projects/mtg/src/DamageResolverLayer.cpp b/projects/mtg/src/DamageResolverLayer.cpp index 2872d6c7c..11fcec5c8 100644 --- a/projects/mtg/src/DamageResolverLayer.cpp +++ b/projects/mtg/src/DamageResolverLayer.cpp @@ -115,8 +115,8 @@ DamagerDamaged * DamageResolverLayer::addIfNotExists(MTGCardInstance * card, Pla void DamageResolverLayer::updateAllCoordinates(){ for (int i = 0; i < mCount; i++){ - DamagerDamaged * item = (DamagerDamaged *)mObjects[i]; /* + DamagerDamaged * item = (DamagerDamaged *)mObjects[i]; CardGui * cardg = game->mLayers->playLayer()->getByCard(item->card); item->x = cardg->x; item->y = cardg->y; diff --git a/projects/mtg/src/DamagerDamaged.cpp b/projects/mtg/src/DamagerDamaged.cpp index aff5dbcaf..300e5b7e4 100644 --- a/projects/mtg/src/DamagerDamaged.cpp +++ b/projects/mtg/src/DamagerDamaged.cpp @@ -77,9 +77,9 @@ void DamagerDamaged::Render(Player * currentPlayer){ JLBFont * mFont = GameApp::CommonRes->GetJLBFont(Constants::MAIN_FONT); mFont->SetBase(0); // CardGui::Render(); - char buf[4096]; - + /* + char buf[4096]; if (currentPlayer != damageSelecter){ if (hasLethalDamage()){ mFont->DrawString("X",x,y);