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

Jeck - Please review: this makes minor changes to a lot of files, and major changes to the WCache flatten() function.

Browse Source 
* Removed all calls to Release(JQuad*).
* Updated flatten(). Prior flatten was buggy beyond belief.
* Done some extensive testing, but if this causes more trouble than it fixes, we'll have to revert. It's too close to release time.
This commit is contained in:
wagic.jeck
2009-10-27 02:46:39 +00:00
parent 538248d979
commit fb7f48f26b
17 changed files with 114 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
projects/mtg/src/GuiPhaseBar.cpp
View File

@@ -23,19 +23,19 @@ static int colors[] =
GuiPhaseBar::GuiPhaseBar() : phase(GameObserver::GetInstance()->phaseRing->getCurrentPhase()), angle(0.0f)
{
JTexture* texture = resources.GetTexture("phasebar.png");
if (texture)
quad = NEW JQuad(texture, 0, 0, Width, Height);
JQuad * quad;
if ((quad = resources.GetQuad("phasebar")) != NULL){
quad->mHeight = Height;
quad->mWidth = Width;
}
else
{
quad = NULL;
GameApp::systemError = "Error loading phasebar texture : " __FILE__;
}
{
GameApp::systemError = "Error loading phasebar texture : " __FILE__;
}
}
GuiPhaseBar::~GuiPhaseBar()
{
delete(quad);
}
void GuiPhaseBar::Update(float dt)
@@ -49,6 +49,7 @@ void GuiPhaseBar::Render()
static const float CENTER = SCREEN_HEIGHT_F / 2 + 10;
JRenderer* renderer = JRenderer::GetInstance();
GameObserver * g = GameObserver::GetInstance();
JQuad * quad = resources.GetQuad("phasebar");
unsigned p = (phase->id + Phases - 4) * (Width+1);
float scale;
float start = CENTER + (Width / 2) * angle * ICONSCALE / (M_PI / 6) - ICONSCALE * Width / 4;