[Scummvm-cvs-logs] CVS: scummvm/queen queen.cpp,1.92,1.93 resource.cpp,1.52,1.53

[Gregory Montoir]

Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8889/queen

Modified Files:
	queen.cpp resource.cpp 
Log Message:
change engine initialization as suggested on -devel

Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- queen.cpp	22 Oct 2004 23:44:08 -0000	1.92
+++ queen.cpp	15 Nov 2004 19:38:57 -0000	1.93
@@ -91,13 +91,6 @@
 
 QueenEngine::QueenEngine(GameDetector *detector, OSystem *syst)
 	: Engine(syst) {
-
-	if (!_mixer->isReady())
-		warning("Sound initialisation failed.");
-
-	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
-
-	_system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
 }
 
 QueenEngine::~QueenEngine() {
@@ -329,6 +322,8 @@
 }
 
 void QueenEngine::initialise(void) {
+	_system->initSize(GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
+
 	_bam = new BamScene(this);
 	_resource = new Resource();
 	_bankMan = new BankManager(_resource);
@@ -347,6 +342,10 @@
 		_logic = new LogicGame(this);
 	}
 
+	if (!_mixer->isReady())
+		warning("Sound initialisation failed.");
+	_mixer->setVolume(ConfMan.getInt("sfx_volume"));
+
 	int midiDriver = GameDetector::detectMusicDriver(MDT_NATIVE | MDT_ADLIB | MDT_PREFER_NATIVE);
 	MidiDriver *driver = GameDetector::createMidi(midiDriver);
 	if (!driver)

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/resource.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- resource.cpp	9 Nov 2004 10:26:32 -0000	1.52
+++ resource.cpp	15 Nov 2004 19:38:57 -0000	1.53
@@ -70,10 +70,11 @@
 }
 
 ResourceEntry *Resource::resourceEntry(const char *filename) const {
+	assert(filename[0] && strlen(filename) < 14);
+
 	char entryName[14];
 	char *ptr = entryName;
 
-	assert(strlen(filename));
 	strcpy(entryName, filename);
 	do
 		*ptr = toupper(*ptr);
@@ -104,8 +105,8 @@
 	if (size != NULL) {
 		*size = sz;
 	}
-	byte *dstBuf;
 
+	byte *dstBuf;
 	if (useMalloc) {
 		dstBuf = (byte *)malloc(sz);
 	} else {