diff --git a/projects/mtg/include/GameOptions.h b/projects/mtg/include/GameOptions.h index 81d5ffcd9..27b02f7ad 100644 --- a/projects/mtg/include/GameOptions.h +++ b/projects/mtg/include/GameOptions.h @@ -12,6 +12,7 @@ using std::string; #define OPTIONS_MOMIR_MODE_UNLOCKED "prx_rimom" //haha #define OPTIONS_DIFFICULTY "difficulty" #define OPTIONS_CACHESIZE "cacheSize" +#define OPTIONS_PLASMAEFFECT "plasmaEffect" // WALDORF - added #define OPTIONS_INTERRUPT_SECONDS "interruptSeconds" diff --git a/projects/mtg/src/CardEffect.cpp b/projects/mtg/src/CardEffect.cpp index 9b8eb4db1..20dc5102f 100644 --- a/projects/mtg/src/CardEffect.cpp +++ b/projects/mtg/src/CardEffect.cpp @@ -1,5 +1,6 @@ #include "../include/GameApp.h" #include "../include/MTGCard.h" +#include "../include/GameOptions.h" #include "../include/CardEffect.h" PIXEL_TYPE CardEffect::surface[] = {}; @@ -16,8 +17,9 @@ CardEffect::CardEffect() palette[i] = ARGB(((unsigned char)(191 + 64 * (sinf(M_PI*sinf(2*M_PI*((float)i)/256.0)/2)))), 0, - ((unsigned char)(64 + 64 * (cosf(M_PI*sinf(2*M_PI*((float)i)/256.0)/2)))), - (unsigned char)(255 * (0.5 + sinf(2*M_PI*((float)i)/256.0)/2) * (0.5 + sinf(2*M_PI*((float)i)/256.0)/2)) + (unsigned char)(200 * (0.5 + sinf(2*M_PI*((float)i)/256.0)/2) * (0.5 + sinf(2*M_PI*((float)i)/256.0)/2)), + (unsigned char)(200 * (0.5 + sinf(2*M_PI*((float)i)/256.0)/2) ), + ); } } @@ -29,6 +31,7 @@ CardEffect::~CardEffect() void CardEffect::UpdateSmall(float dt) { + if (!GameOptions::GetInstance()->values[OPTIONS_PLASMAEFFECT].getIntValue()) return; static float t = 0; t += 3*dt; unsigned char c = (unsigned char)(5*t); @@ -44,6 +47,7 @@ void CardEffect::UpdateSmall(float dt) void CardEffect::UpdateBig(float dt) { + if (!GameOptions::GetInstance()->values[OPTIONS_PLASMAEFFECT].getIntValue()) return; static float t = 0; t += 3*dt; unsigned char c = (unsigned char)(9*t); diff --git a/projects/mtg/src/ShopItem.cpp b/projects/mtg/src/ShopItem.cpp index 80f69fcf6..ad1bb170c 100644 --- a/projects/mtg/src/ShopItem.cpp +++ b/projects/mtg/src/ShopItem.cpp @@ -97,6 +97,7 @@ void ShopItem::Render(){ quad = card->getQuad(); } if (quad){ + quad->SetColor(ARGB(255,255,255,255)); renderer->RenderQuad(quad,mX + SCREEN_WIDTH/2 + 20,5,0, 0.9f,0.9f); }else{ if (card) CardGui::alternateRender(card,NULL,mX + SCREEN_WIDTH/2 + 100 + 20,133,0, 0.9f);