- another attempt to fix game end crash for ultifd
This commit is contained in:
parent
bc3e6bc64e
commit
c63283ffac
|
@ -110,7 +110,7 @@ Game::~Game(){
|
||||||
|
|
||||||
world.end(); //must die before selection because of referencers
|
world.end(); //must die before selection because of referencers
|
||||||
|
|
||||||
//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==================== init and load ====================
|
// ==================== init and load ====================
|
||||||
|
@ -555,6 +555,7 @@ void Game::update(){
|
||||||
errorMessageBox.getEnabled() == false) {
|
errorMessageBox.getEnabled() == false) {
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
quitGame();
|
quitGame();
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
//update auto test
|
//update auto test
|
||||||
|
|
|
@ -344,7 +344,12 @@ void Program::setState(ProgramState *programState, bool cleanupOldState)
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
delete this->programState;
|
delete this->programState;
|
||||||
|
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
this->programState = NULL;
|
this->programState = NULL;
|
||||||
|
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,26 @@ namespace Glest{ namespace Game{
|
||||||
// class Faction
|
// class Faction
|
||||||
// =====================================================
|
// =====================================================
|
||||||
|
|
||||||
|
Faction::Faction() {
|
||||||
|
texture = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
Faction::~Faction() {
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
|
Renderer &renderer= Renderer::getInstance();
|
||||||
|
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
|
//renderer.endTexture(rsGame,texture);
|
||||||
|
//texture->end();
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
|
//delete texture;
|
||||||
|
texture = NULL;
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
}
|
||||||
|
|
||||||
void Faction::init(
|
void Faction::init(
|
||||||
const FactionType *factionType, ControlType control, TechTree *techTree, Game *game,
|
const FactionType *factionType, ControlType control, TechTree *techTree, Game *game,
|
||||||
int factionIndex, int teamIndex, int startLocationIndex, bool thisFaction, bool giveResources)
|
int factionIndex, int teamIndex, int startLocationIndex, bool thisFaction, bool giveResources)
|
||||||
|
|
|
@ -76,6 +76,9 @@ private:
|
||||||
bool thisFaction;
|
bool thisFaction;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
Faction();
|
||||||
|
~Faction();
|
||||||
|
|
||||||
void init(
|
void init(
|
||||||
const FactionType *factionType, ControlType control, TechTree *techTree, Game *game,
|
const FactionType *factionType, ControlType control, TechTree *techTree, Game *game,
|
||||||
int factionIndex, int teamIndex, int startLocationIndex, bool thisFaction, bool giveResources);
|
int factionIndex, int teamIndex, int startLocationIndex, bool thisFaction, bool giveResources);
|
||||||
|
|
|
@ -80,8 +80,14 @@ World::~World() {
|
||||||
|
|
||||||
delete techTree;
|
delete techTree;
|
||||||
techTree = NULL;
|
techTree = NULL;
|
||||||
|
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
delete routePlanner;
|
delete routePlanner;
|
||||||
routePlanner = 0;
|
routePlanner = 0;
|
||||||
|
|
||||||
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
||||||
delete cartographer;
|
delete cartographer;
|
||||||
cartographer = 0;
|
cartographer = 0;
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user