aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-12-21 19:09:57 +0100
committeruruk2013-12-21 19:09:57 +0100
commiteeca348953d851d11f98b9b78d9bba0043937614 (patch)
tree098fb3fd4aff90d7e1d8db86fb504f220de4d2d1
parent439817d42ee75c30a1de9a3817f38360fef5a40d (diff)
downloadscummvm-rg350-eeca348953d851d11f98b9b78d9bba0043937614.tar.gz
scummvm-rg350-eeca348953d851d11f98b9b78d9bba0043937614.tar.bz2
scummvm-rg350-eeca348953d851d11f98b9b78d9bba0043937614.zip
AVALANCHE: Move freeing of the used surfaces in Nim to a better place.
-rw-r--r--engines/avalanche/graphics.cpp12
-rw-r--r--engines/avalanche/graphics.h1
-rw-r--r--engines/avalanche/nim.cpp2
3 files changed, 10 insertions, 5 deletions
diff --git a/engines/avalanche/graphics.cpp b/engines/avalanche/graphics.cpp
index f23ef2a78c..4b8d667fbf 100644
--- a/engines/avalanche/graphics.cpp
+++ b/engines/avalanche/graphics.cpp
@@ -60,11 +60,6 @@ GraphicManager::~GraphicManager() {
_scrolls.free();
_backup.free();
- _nimStone.free();
- for (int i = 0; i < 3; i++)
- _nimInitials[i].free();
- _nimLogo.free();
-
for (int i = 0; i < 10; i++)
_digits[i].free();
for (int i = 0; i < 9; i++)
@@ -494,6 +489,13 @@ void GraphicManager::nimDrawLogo() {
drawPicture(_surface, _nimLogo, 392, 5);
}
+void GraphicManager::nimFree() {
+ _nimStone.free();
+ for (int i = 0; i < 3; i++)
+ _nimInitials[i].free();
+ _nimLogo.free();
+}
+
/**
* This function mimics Pascal's getimage().
*/
diff --git a/engines/avalanche/graphics.h b/engines/avalanche/graphics.h
index e230896ce2..0de23612a7 100644
--- a/engines/avalanche/graphics.h
+++ b/engines/avalanche/graphics.h
@@ -84,6 +84,7 @@ public:
void nimDrawStone(int x, int y);
void nimDrawInitials();
void nimDrawLogo();
+ void nimFree();
void clearAlso();
void clearTextBar();
diff --git a/engines/avalanche/nim.cpp b/engines/avalanche/nim.cpp
index 6b36ab8b17..be32f7cf3a 100644
--- a/engines/avalanche/nim.cpp
+++ b/engines/avalanche/nim.cpp
@@ -424,6 +424,8 @@ void Nim::endOfGame() {
}
}
}
+
+ _vm->_graphics->nimFree();
}
bool Nim::find(byte x) {