aboutsummaryrefslogtreecommitdiff
path: root/engines/cge2/cge2.cpp
diff options
context:
space:
mode:
authoruruk2014-05-24 00:11:43 +0200
committeruruk2014-05-24 00:11:43 +0200
commiteb800807849989fc44f85ec2113520e868c4f7a8 (patch)
tree7763c3f0cb938580c58417b27119774e21b93898 /engines/cge2/cge2.cpp
parent947f4b860759940dfc6420ca84870b210b1253c5 (diff)
downloadscummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.tar.gz
scummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.tar.bz2
scummvm-rg350-eb800807849989fc44f85ec2113520e868c4f7a8.zip
CGE2: Some refactoring and fixing regarding runCommand().
Diffstat (limited to 'engines/cge2/cge2.cpp')
-rw-r--r--engines/cge2/cge2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index e15e096d9f..ef4646194e 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -97,7 +97,6 @@ void CGE2Engine::init() {
_commandHandlerTurbo = new CommandHandler(this, true);
_infoLine = new InfoLine(this, kInfoW);
_mouse = new Mouse(this);
- _talk = new Talk(this);
for (int i = 0; i < kMaxPoint; i++)
_point[i] = new V3D();
}
@@ -124,7 +123,8 @@ void CGE2Engine::deinit() {
delete _commandHandlerTurbo;
delete _infoLine;
delete _mouse;
- delete _talk;
+ if (_talk != nullptr)
+ delete _talk;
for (int i = 0; i < kMaxPoint; i++) {
delete _point[i];
}