aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-07-29 21:40:42 +0000
committerPaweł Kołodziejski2002-07-29 21:40:42 +0000
commitf2265feadfc888e5f380a4e4503cb537d2f21dd1 (patch)
treeace28c475442e4c44b3697bbc0bce4624f807309
parentc56c8ea5e618a74000e7bdce09c40eca7f3b01fb (diff)
downloadscummvm-rg350-f2265feadfc888e5f380a4e4503cb537d2f21dd1.tar.gz
scummvm-rg350-f2265feadfc888e5f380a4e4503cb537d2f21dd1.tar.bz2
scummvm-rg350-f2265feadfc888e5f380a4e4503cb537d2f21dd1.zip
moved new/delete for Bundle class
svn-id: r4679
-rw-r--r--init.cpp4
-rw-r--r--scummvm.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/init.cpp b/init.cpp
index 1f51baf3fe..050b3b5903 100644
--- a/init.cpp
+++ b/init.cpp
@@ -27,9 +27,11 @@
Scumm::Scumm (void) {
_newgui = new NewGui(this);
+ _bundle = new Bundle(this);
}
Scumm::~Scumm (void) {
delete [] _actors;
delete _newgui;
-} \ No newline at end of file
+ delete _bundle;
+}
diff --git a/scummvm.cpp b/scummvm.cpp
index b82b9a173e..d1c60cc260 100644
--- a/scummvm.cpp
+++ b/scummvm.cpp
@@ -84,7 +84,6 @@ void Scumm::scummInit()
setShake(0);
setupCursor();
- _bundle = new Bundle(this);
/* Allocate and initilise actors */
_actors = new Actor[MAX_ACTORS];
for (i = 1, a = getFirstActor(); ++a, i < NUM_ACTORS; i++) {
@@ -1583,7 +1582,6 @@ void Scumm::go() {
launch();
setupGUIColors();
mainRun();
- delete _bundle;
}