Jeck - Potential fixes for issue 312.

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

View File

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

View File

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

View File

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