From 8b0e9502ec706cc82b05c216801ac0fd0a46d7fd Mon Sep 17 00:00:00 2001
From: Gregory Montoir
Date: Fri, 6 Aug 2004 17:01:58 +0000
Subject: cleanup and simplify Resource class a bit more

svn-id: r14488
---
 queen/music.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'queen/music.cpp')

diff --git a/queen/music.cpp b/queen/music.cpp
index 6f783e7916..a265cca85e 100644
--- a/queen/music.cpp
+++ b/queen/music.cpp
@@ -324,11 +324,9 @@ static const byte mt32_to_gm[128] = {
 
 	Music::Music(MidiDriver *driver, QueenEngine *vm) : _vToggle(false) {
 		if (vm->resource()->isDemo()) {
-			_musicData = vm->resource()->loadFile("AQ8.RL", 0, NULL);
-			_musicDataSize = vm->resource()->fileSize("AQ8.RL");
+			_musicData = vm->resource()->loadFile("AQ8.RL", 0, &_musicDataSize);
 		} else {
-			_musicData = vm->resource()->loadFile("AQ.RL", 0, NULL);
-			_musicDataSize = vm->resource()->fileSize("AQ.RL");
+			_musicData = vm->resource()->loadFile("AQ.RL", 0, &_musicDataSize);
 		}
 		
 		_player = new MusicPlayer(driver, _musicData, _musicDataSize);
-- 
cgit v1.2.3