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

Erwan

Browse Source 
- Using SAFE_DELETE macro for simplemenu object, in the hope to find the heap corruption problem
This commit is contained in:
wagic.the.homebrew
2008-11-29 05:21:54 +00:00
parent 1ca143abd7
commit 1cec867b95
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
projects/mtg/include/GameStateMenu.h
View File

@@ -135,18 +135,16 @@ class GameStateMenu: public GameState, public JGuiListener
virtual void Destroy() virtual void Destroy()
{ {
if (mGuiController)
delete mGuiController; SAFE_DELETE(mGuiController);
if (subMenuController) SAFE_DELETE(subMenuController);
delete subMenuController;
if (mIconsTexture) SAFE_DELETE(mIconsTexture);
delete mIconsTexture;
for (int i = 0; i < 10 ; i++){ for (int i = 0; i < 10 ; i++){
delete mIcons[i]; SAFE_DELETE(mIcons[i]);
} }
SAFE_DELETE(mBg); SAFE_DELETE(mBg);
@@ -161,7 +159,7 @@ class GameStateMenu: public GameState, public JGuiListener
virtual void Start(){ virtual void Start(){
JRenderer::GetInstance()->ResetPrivateVRAM(); JRenderer::GetInstance()->ResetPrivateVRAM();
JRenderer::GetInstance()->EnableVSync(true); JRenderer::GetInstance()->EnableVSync(true);
subMenuController = NULL;
if (GameApp::HasMusic && !GameApp::music && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){ if (GameApp::HasMusic && !GameApp::music && GameOptions::GetInstance()->values[OPTIONS_MUSICVOLUME] > 0){
GameApp::music = JSoundSystem::GetInstance()->LoadMusic("sound/Track0.mp3"); GameApp::music = JSoundSystem::GetInstance()->LoadMusic("sound/Track0.mp3");
@@ -266,7 +264,7 @@ class GameStateMenu: public GameState, public JGuiListener
if (currentState == STATE_MENU && mGuiController!=NULL) if (currentState == STATE_MENU && mGuiController!=NULL)
mGuiController->Update(dt); mGuiController->Update(dt);
if (currentState == STATE_SUBMENU){ if (currentState == STATE_SUBMENU){
if( subMenuController != NULL){ if( subMenuController){
subMenuController->Update(dt); subMenuController->Update(dt);
}else{ }else{
@@ -390,7 +388,7 @@ class GameStateMenu: public GameState, public JGuiListener
mFont->DrawString(nbcardsStr,10, SCREEN_HEIGHT-15); mFont->DrawString(nbcardsStr,10, SCREEN_HEIGHT-15);
mFont->SetScale(1.f); mFont->SetScale(1.f);
mFont->SetColor(ARGB(255,255,255,255)); mFont->SetColor(ARGB(255,255,255,255));
if (currentState == STATE_SUBMENU && subMenuController != NULL){ if (currentState == STATE_SUBMENU && subMenuController){
subMenuController->Render(); subMenuController->Render();
} }