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

Merge pull request #29 from WagicProject/master

Browse Source 
getting master
This commit is contained in:
zethfoxster
2016-07-22 18:05:16 -04:00
committed by GitHub
parent 0a3d9f9876 a99c57ab1a
commit 2d76c8ff0d
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AIPlayerBaka.cpp
+2 -2
View File
@@ -2739,8 +2739,8 @@ int AIPlayerBaka::getCreaturesInfo(Player * player, int neededInfo, int untapMod
result++;
}
else
{
result += card->power;
{//AI should consider COMBATTOUGHNESS for attackers and blockers
result += card->has(Constants::COMBATTOUGHNESS) ? card->toughness : card->power;
}
}
}
projects/mtg/src/GuiCombat.cpp
+4 -2
View File
@@ -500,8 +500,10 @@ void GuiCombat::Render()
}
if (ok_tex)
{
JQuadPtr ok_quad = WResourceManager::Instance()->RetrieveTempQuad("Ok.png");
ok_quad->SetHotSpot(28, 22);
JQuadPtr ok_quad = WResourceManager::Instance()->RetrieveQuad("Ok.png", 0.0f, 0.0f, ok_tex->mWidth - 4.5f, ok_tex->mHeight - 4.5f);
ok_quad->mWidth = 56.f;
ok_quad->mHeight = 45.f;
ok_quad->SetHotSpot(ok_quad->mWidth/2, ok_quad->mHeight/2);
ok.Render(ok_quad.get());
}
renderer->DrawLine(0, SCREEN_HEIGHT / 2, SCREEN_WIDTH, SCREEN_HEIGHT / 2, ARGB(255, 255, 64, 0));
projects/mtg/src/WResourceManager.cpp
+9 -5
View File
@@ -234,10 +234,14 @@ JQuadPtr ResourceManagerImpl::RetrieveCard(MTGCard * card, int style, int submod
submode = submode | TEXTURE_SUB_CARD;
static std::ostringstream filename;
filename.str("");
filename << setlist[card->setId] << "/" << card->getImageName();
//static std::ostringstream filename;
//filename.str("");
string filename;
filename.reserve(4096);
//filename << setlist[card->setId] << "/" << card->getImageName();
filename.append(setlist[card->setId]);
filename.append("/");
filename.append(card->getImageName());
int id = card->getMTGId();
//Aliases.
@@ -247,7 +251,7 @@ JQuadPtr ResourceManagerImpl::RetrieveCard(MTGCard * card, int style, int submod
style = RETRIEVE_NORMAL;
}
JQuadPtr jq = RetrieveQuad(filename.str(), 0, 0, 0, 0, "", style, submode | TEXTURE_SUB_5551, id);
JQuadPtr jq = RetrieveQuad(filename, 0, 0, 0, 0, "", style, submode | TEXTURE_SUB_5551, id);
lastError = textureWCache.mError;
if (jq)