diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-18 14:27:57 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-18 14:27:57 (GMT) |
| commit | 9d7a4e55f2a651ea8e420aab2cc5fa78998c1ddc (patch) | |
| tree | d05b086e0d4a539fd0aef79dbcd6e09f574bcc52 /src | |
| parent | 741392f2c1c2de8134e4b76a288d1e8b711526cd (diff) | |
| download | powder-9d7a4e55f2a651ea8e420aab2cc5fa78998c1ddc.zip powder-9d7a4e55f2a651ea8e420aab2cc5fa78998c1ddc.tar.gz | |
Menu frees any added items
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/GameModel.cpp | 4 | ||||
| -rw-r--r-- | src/game/Menu.h | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/game/GameModel.cpp b/src/game/GameModel.cpp index 5c9344d..cf9324b 100644 --- a/src/game/GameModel.cpp +++ b/src/game/GameModel.cpp @@ -170,10 +170,6 @@ GameModel::~GameModel() for(int i = 0; i < menuList.size(); i++) { - for(int j = 0; i < menuList[i]->GetToolList().size(); i++) - { - delete menuList[i]->GetToolList()[j]; - } delete menuList[i]; } for(int i = 0; i < brushList.size(); i++) diff --git a/src/game/Menu.h b/src/game/Menu.h index 1824190..261193e 100644 --- a/src/game/Menu.h +++ b/src/game/Menu.h @@ -24,6 +24,15 @@ public: } + virtual ~Menu() + { + for(int i = 0; i < tools.size(); i++) + { + delete tools[i]; + } + tools.clear(); + } + vector<Tool*> GetToolList() { return tools; |