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

Jeck - Potential fixes for issue 312.

Browse Source
This commit is contained in:
wagic.jeck
2010-02-03 20:18:06 +00:00
parent 9aa8d37b50
commit 4a86166568
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@
class TransitionBase: public GameState, public JGuiListener{ class TransitionBase: public GameState, public JGuiListener{
public: public:
TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration); TransitionBase(GameApp* parent, GameState* _from, GameState* _to, float duration);
~TransitionBase();
virtual void Start(); virtual void Start();
virtual void End(); virtual void End();

5
projects/mtg/src/GameStateTransitions.cpp
View File

@@ -35,12 +35,13 @@ void TransitionBase::Start() {
void TransitionBase::End() { void TransitionBase::End() {
mElapsed = 0; mElapsed = 0;
};
TransitionBase::~TransitionBase(){
if(!bAnimationOnly){ if(!bAnimationOnly){
if(from) if(from)
from->End(); from->End();
} }
}; }
void TransitionFade::Render(){ void TransitionFade::Render(){
if(from) if(from)
from->Render(); from->Render();

5
projects/mtg/src/Tasks.cpp
View File

@@ -359,6 +359,8 @@ void TaskList::Start(){
mState = TASKS_IN; mState = TASKS_IN;
if(!mBgTex){ if(!mBgTex){
mBgTex = resources.RetrieveTexture("taskboard.png"); mBgTex = resources.RetrieveTexture("taskboard.png");
for(int i=0;i<9;i++)
SAFE_DELETE(mBg[i]);
if(mBgTex){ if(mBgTex){
mBg[0] = NEW JQuad(mBgTex,0,0,64,64); mBg[0] = NEW JQuad(mBgTex,0,0,64,64);
mBg[1] = NEW JQuad(mBgTex,64,0,128,64); mBg[1] = NEW JQuad(mBgTex,64,0,128,64);
@@ -370,9 +372,6 @@ void TaskList::Start(){
mBg[7] = NEW JQuad(mBgTex,64,192,128,64); mBg[7] = NEW JQuad(mBgTex,64,192,128,64);
mBg[8] = NEW JQuad(mBgTex,192,192,64,64); mBg[8] = NEW JQuad(mBgTex,192,192,64,64);
} }
else
for(int i=0;i<9;i++)
SAFE_DELETE(mBg[i]);
} }
} }
void TaskList::End(){ void TaskList::End(){