[Scummvm-cvs-logs] CVS: scummvm init.cpp,1.14,1.15 scummvm.cpp,1.195,1.196

Pawe? Ko?odziejski aquadran at users.sourceforge.net
Mon Jul 29 14:41:03 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv10594

Modified Files:
	init.cpp scummvm.cpp 
Log Message:
moved new/delete for Bundle class

Index: init.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/init.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- init.cpp	16 Jul 2002 21:03:14 -0000	1.14
+++ init.cpp	29 Jul 2002 21:40:42 -0000	1.15
@@ -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;
+}

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -d -r1.195 -r1.196
--- scummvm.cpp	28 Jul 2002 15:35:25 -0000	1.195
+++ scummvm.cpp	29 Jul 2002 21:40:42 -0000	1.196
@@ -84,7 +84,6 @@
 	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 @@
 	launch();
 	setupGUIColors();
 	mainRun();
-	delete _bundle;
 }
 
 





More information about the Scummvm-git-logs mailing list