diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 6089d775e..0d887ef9f 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -533,6 +533,7 @@ class AManaProducer: public MTGAbility{ if (mParticleSys) mParticleSys->MoveTo(x, y); if (mParticleSys && animation == 1.f) mParticleSys->Fire(); animation -= 4 *dt; + if (!animation) animation = -1; if (animation < 0){ animation = 0; currentlyTapping--; diff --git a/projects/mtg/include/GameStateMenu.h b/projects/mtg/include/GameStateMenu.h index b4f39e0b9..9e7a8bcf3 100644 --- a/projects/mtg/include/GameStateMenu.h +++ b/projects/mtg/include/GameStateMenu.h @@ -20,7 +20,7 @@ #define STATE_FIRST_TIME 4 #define STATE_WARNING 5 -#define GAME_VERSION "WTH?! 0.3.0 - by WilLoW" +#define GAME_VERSION "WTH?! 0.3.1 - by WilLoW" #define ALPHA_WARNING 0 #define DEFAULT_ANGLE_MULTIPLIER 0.4 diff --git a/projects/mtg/src/ActionStack.cpp b/projects/mtg/src/ActionStack.cpp index 7d9a73c4f..465e02aba 100644 --- a/projects/mtg/src/ActionStack.cpp +++ b/projects/mtg/src/ActionStack.cpp @@ -50,6 +50,7 @@ void StackAbility::Render(){ JRenderer * renderer = JRenderer::GetInstance(); JQuad * quad = ability->source->getThumb(); if (quad){ + quad->SetColor(ARGB(255,255,255,255)); float scale = 30 / quad->mHeight; renderer->RenderQuad(quad, x , y , 0,scale,scale); }else{ @@ -110,6 +111,7 @@ void Spell::Render(){ JRenderer * renderer = JRenderer::GetInstance(); JQuad * quad = source->getThumb(); if (quad){ + quad->SetColor(ARGB(255,255,255,255)); float scale = mHeight / quad->mHeight; renderer->RenderQuad(quad, x , y , 0,scale,scale); }else{ @@ -119,6 +121,7 @@ void Spell::Render(){ if (target){ quad = target->getIcon(); if (quad){ + quad->SetColor(ARGB(255,255,255,255)); float scale = 30 / quad->mHeight; renderer->RenderQuad(quad, x + 150 , y , 0,scale,scale); } @@ -156,6 +159,7 @@ void PutInGraveyard::Render(){ JRenderer * renderer = JRenderer::GetInstance(); JQuad * quad = card->getThumb(); if (quad){ + quad->SetColor(ARGB(255,255,255,255)); float scale = 30 / quad->mHeight; renderer->RenderQuad(quad, x , y , 0,scale,scale); }else{