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

Erwan

Browse Source 
- plasma Effect made an option (plasmaEffect=1 in settings/options.txt)
- Changed plasma effect colors to something "gold-ish". J, feel free to revert
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-05-31 05:26:16 +00:00
parent ca061a048b
commit 03c8b5e272
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/mtg/include/GameOptions.h
View File

@@ -12,6 +12,7 @@ using std::string;
#define OPTIONS_MOMIR_MODE_UNLOCKED "prx_rimom" //haha #define OPTIONS_MOMIR_MODE_UNLOCKED "prx_rimom" //haha
#define OPTIONS_DIFFICULTY "difficulty" #define OPTIONS_DIFFICULTY "difficulty"
#define OPTIONS_CACHESIZE "cacheSize" #define OPTIONS_CACHESIZE "cacheSize"
#define OPTIONS_PLASMAEFFECT "plasmaEffect"
// WALDORF - added // WALDORF - added
#define OPTIONS_INTERRUPT_SECONDS "interruptSeconds" #define OPTIONS_INTERRUPT_SECONDS "interruptSeconds"

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

@@ -1,5 +1,6 @@
#include "../include/GameApp.h" #include "../include/GameApp.h"
#include "../include/MTGCard.h" #include "../include/MTGCard.h"
#include "../include/GameOptions.h"
#include "../include/CardEffect.h" #include "../include/CardEffect.h"
PIXEL_TYPE CardEffect::surface[] = {}; 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)))), palette[i] = ARGB(((unsigned char)(191 + 64 * (sinf(M_PI*sinf(2*M_PI*((float)i)/256.0)/2)))),
0, 0,
((unsigned char)(64 + 64 * (cosf(M_PI*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)(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) ),
); );
} }
} }
@@ -29,6 +31,7 @@ CardEffect::~CardEffect()
void CardEffect::UpdateSmall(float dt) void CardEffect::UpdateSmall(float dt)
{ {
if (!GameOptions::GetInstance()->values[OPTIONS_PLASMAEFFECT].getIntValue()) return;
static float t = 0; static float t = 0;
t += 3*dt; t += 3*dt;
unsigned char c = (unsigned char)(5*t); unsigned char c = (unsigned char)(5*t);
@@ -44,6 +47,7 @@ void CardEffect::UpdateSmall(float dt)
void CardEffect::UpdateBig(float dt) void CardEffect::UpdateBig(float dt)
{ {
if (!GameOptions::GetInstance()->values[OPTIONS_PLASMAEFFECT].getIntValue()) return;
static float t = 0; static float t = 0;
t += 3*dt; t += 3*dt;
unsigned char c = (unsigned char)(9*t); unsigned char c = (unsigned char)(9*t);

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

@@ -97,6 +97,7 @@ void ShopItem::Render(){
quad = card->getQuad(); quad = card->getQuad();
} }
if (quad){ if (quad){
quad->SetColor(ARGB(255,255,255,255));
renderer->RenderQuad(quad,mX + SCREEN_WIDTH/2 + 20,5,0, 0.9f,0.9f); renderer->RenderQuad(quad,mX + SCREEN_WIDTH/2 + 20,5,0, 0.9f,0.9f);
}else{ }else{
if (card) CardGui::alternateRender(card,NULL,mX + SCREEN_WIDTH/2 + 100 + 20,133,0, 0.9f); if (card) CardGui::alternateRender(card,NULL,mX + SCREEN_WIDTH/2 + 100 + 20,133,0, 0.9f);