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

13
projects/mtg/src/GameStateMenu.cpp
View File

@@ -270,7 +270,6 @@ void GameStateMenu::End()
JRenderer::GetInstance()->EnableVSync(false);
resources.Release(bgTexture);
resources.Release(mBg);
SAFE_DELETE(mGuiController);
}
@@ -292,12 +291,16 @@ void GameStateMenu::Update(float dt)
//Force default, if necessary.
if(options[Options::ACTIVE_PROFILE].str == "")
options[Options::ACTIVE_PROFILE].str = "Default";
//Release splash texture
resources.Release(splashTex);
splashTex = NULL;
mSplash = NULL;
//check for deleted collection / first-timer
std::ifstream file(options.profileFile(PLAYER_COLLECTION).c_str());
if(file){
file.close();
resources.Release(mSplash);
currentState = MENU_STATE_MAJOR_MAINMENU | MENU_STATE_MINOR_NONE;
}else{
currentState = MENU_STATE_MAJOR_FIRST_TIME | MENU_STATE_MINOR_NONE;
@@ -409,8 +412,10 @@ void GameStateMenu::Render()
renderer->ClearScreen(ARGB(0,0,0,0));
JLBFont * mFont = resources.GetJLBFont(Constants::MENU_FONT);
if ((currentState & MENU_STATE_MAJOR) == MENU_STATE_MAJOR_LOADING_CARDS){
if(!mSplash)
mSplash = resources.RetrieveQuad("splash.jpg");
if(!splashTex){
splashTex = resources.RetrieveTexture("splash.jpg",RETRIEVE_LOCK);
mSplash = resources.RetrieveTempQuad("splash.jpg");
}
if (mSplash){
renderer->RenderQuad(mSplash,0,0);
}else{