Skip to content

Commit

Permalink
cleaned up memory freeing at close
Browse files Browse the repository at this point in the history
  • Loading branch information
mrkite committed Mar 18, 2013
1 parent 662f3b0 commit 294bddc
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 0 deletions.
8 changes: 8 additions & 0 deletions biomeidentifier.cpp
Expand Up @@ -33,6 +33,14 @@ BiomeIdentifier::BiomeIdentifier()
{
unknownBiome.name="Unknown";
}
BiomeIdentifier::~BiomeIdentifier()
{
for (int i=0;i<packs.length();i++)
{
for (int j=0;j<packs[i].length();j++)
delete packs[i][j];
}
}

BiomeInfo &BiomeIdentifier::getBiome(int biome)
{
Expand Down
1 change: 1 addition & 0 deletions biomeidentifier.h
Expand Up @@ -44,6 +44,7 @@ class BiomeIdentifier
{
public:
BiomeIdentifier();
~BiomeIdentifier();
int addDefinitions(JSONArray *,int pack=-1);
void enableDefinitions(int);
void disableDefinitions(int);
Expand Down
10 changes: 10 additions & 0 deletions blockidentifier.cpp
Expand Up @@ -38,6 +38,16 @@ BlockIdentifier::BlockIdentifier()
unknownBlock.flags=0;
unknownBlock.name="Unknown";
}
BlockIdentifier::~BlockIdentifier()
{
for (int i=0;i<65536;i++)
cache[i]=NULL;
for (int i=0;i<packs.length();i++)
{
for (int j=0;j<packs[i].length();j++)
delete packs[i][j];
}
}

// this routine is ridiculously slow
BlockInfo &BlockIdentifier::getBlock(int id, int data)
Expand Down
1 change: 1 addition & 0 deletions blockidentifier.h
Expand Up @@ -61,6 +61,7 @@ class BlockIdentifier
{
public:
BlockIdentifier();
~BlockIdentifier();
int addDefinitions(JSONArray *,int pack=-1);
void enableDefinitions(int);
void disableDefinitions(int);
Expand Down
7 changes: 7 additions & 0 deletions definitionmanager.cpp
Expand Up @@ -117,6 +117,13 @@ DefinitionManager::DefinitionManager(QWidget *parent) : QWidget(parent)
refresh();
}

DefinitionManager::~DefinitionManager()
{
delete dimensionList;
delete blocks;
delete biomes;
}

BlockIdentifier *DefinitionManager::blockIdentifier()
{
return blocks;
Expand Down
1 change: 1 addition & 0 deletions definitionmanager.h
Expand Up @@ -64,6 +64,7 @@ class DefinitionManager : public QWidget
Q_OBJECT
public:
explicit DefinitionManager(QWidget *parent = 0);
~DefinitionManager();
void attachMapView(MapView *mapview);
QSize minimumSizeHint() const;
QSize sizeHint() const;
Expand Down
5 changes: 5 additions & 0 deletions dimensions.cpp
Expand Up @@ -48,6 +48,11 @@ Dimensions::Dimensions()
}
Dimensions::~Dimensions()
{
for (int i=0;i<packs.length();i++)
{
for (int j=0;j<packs[i].length();j++)
delete packs[i][j];
}
}

void Dimensions::enableDefinitions(int pack)
Expand Down

0 comments on commit 294bddc

Please sign in to comment.