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

Erwan

Browse Source 
-fix issue 128
This commit is contained in:
wagic.the.homebrew@gmail.com
2009-10-24 11:17:38 +00:00
parent e601d671ee
commit da6d650c3d
2 changed files with 872 additions and 879 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/bin/Res/test/_tests.txt
-2
View File
@@ -1,5 +1,3 @@
ondu_cleric.txt
/*
######################## ########################
#Generic engine features #Generic engine features
######################## ########################
projects/mtg/src/ActionStack.cpp
+5 -10
View File
@@ -52,11 +52,13 @@ ostream& NextGamePhase::toString(ostream& out) const
void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string alt1, string alt2, string action, bool bigQuad){ void Interruptible::Render(MTGCardInstance * source, JQuad * targetQuad, string alt1, string alt2, string action, bool bigQuad){
JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT); JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT);
mFont->SetBase(0); mFont->SetColor(ARGB(255,255,255,255));
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
mFont->DrawString(_(action).c_str(), x + 30 , y, JGETEXT_LEFT); mFont->DrawString(_(action).c_str(), x + 30 , y, JGETEXT_LEFT);
JRenderer * renderer = JRenderer::GetInstance(); JRenderer * renderer = JRenderer::GetInstance();
JQuad * quad = resources.RetrieveCard(source,CACHE_THUMB); JQuad * quad = resources.RetrieveCard(source,CACHE_THUMB);
if (!quad)
quad = CardGui::alternateThumbQuad(source);
if (quad){ if (quad){
quad->SetColor(ARGB(255,255,255,255)); quad->SetColor(ARGB(255,255,255,255));
float scale = mHeight / quad->mHeight; float scale = mHeight / quad->mHeight;
@@ -175,17 +177,13 @@ Spell::~Spell(){
int Spell::resolve(){ int Spell::resolve(){
GameObserver * game = GameObserver::GetInstance(); GameObserver * game = GameObserver::GetInstance();
//TODO Remove target if it's not targettable anymore
/* while (source->next){
source = source->next;
}*/
if (!source->hasType("instant") && !source->hasType("sorcery")){ if (!source->hasType("instant") && !source->hasType("sorcery")){
Player * p = source->controller(); Player * p = source->controller();
source = p->game->putInZone(source,from,p->game->battlefield); source = p->game->putInZone(source,from,p->game->battlefield);
from = p->game->battlefield; from = p->game->battlefield;
} }
//Play SFX //Play SFX
if (options[Options::SFXVOLUME].number > 0){ if (options[Options::SFXVOLUME].number > 0){
JSample * sample = source->getSample(); JSample * sample = source->getSample();
@@ -537,7 +535,6 @@ void ActionStack::Update(float dt){
//Select Stack's display mode //Select Stack's display mode
if (mode==ACTIONSTACK_STANDARD && tc && !checked){ if (mode==ACTIONSTACK_STANDARD && tc && !checked){
checked = 1; checked = 1;
//unpackDamageStacks();
for (int i = 0; i < mCount ; i++){ for (int i = 0; i < mCount ; i++){
Interruptible * current = (Interruptible *)mObjects[i]; Interruptible * current = (Interruptible *)mObjects[i];
if (tc->canTarget(current)){ if (tc->canTarget(current)){
@@ -552,12 +549,10 @@ void ActionStack::Update(float dt){
} }
} }
if (mode != ACTIONSTACK_TARGET){ if (mode != ACTIONSTACK_TARGET){
//repackDamageStacks();
} }
}else if (mode==ACTIONSTACK_TARGET && !tc){ }else if (mode==ACTIONSTACK_TARGET && !tc){
mode = ACTIONSTACK_STANDARD; mode = ACTIONSTACK_STANDARD;
checked = 0; checked = 0;
//repackDamageStacks();
} }
if (mode == ACTIONSTACK_STANDARD){ if (mode == ACTIONSTACK_STANDARD){
@@ -798,8 +793,8 @@ void ActionStack::Render(){
} }
JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT); JLBFont * mFont = resources.GetJLBFont(Constants::MAIN_FONT);
mFont->SetBase(0);
mFont->SetScale(DEFAULT_MAIN_FONT_SCALE); mFont->SetScale(DEFAULT_MAIN_FONT_SCALE);
mFont->SetColor(ARGB(255,255,255,255));
JRenderer * renderer = JRenderer::GetInstance(); JRenderer * renderer = JRenderer::GetInstance();
renderer->FillRect(x0 ,y0 , width ,height , ARGB(200,0,0,0)); renderer->FillRect(x0 ,y0 , width ,height , ARGB(200,0,0,0));