[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.60,1.61

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv3969

Modified Files:
	script_v5.cpp 
Log Message:
only moved stuff (to group sound related stuff)

Index: script_v5.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v5.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- script_v5.cpp	3 May 2003 07:29:44 -0000	1.60
+++ script_v5.cpp	3 May 2003 17:50:04 -0000	1.61
@@ -1292,15 +1292,6 @@
 		o5_jumpRelative();
 }
 
-void Scumm_v5::o5_isSoundRunning() {
-	int snd;
-	getResultPos();
-	snd = getVarOrDirectByte(0x80);
-	if (snd)
-		snd = _sound->isSoundRunning(snd);
-	setResult(snd);
-}
-
 void Scumm_v5::o5_jumpRelative() {
 	_scriptPointer += (int16)fetchScriptWord();
 }
@@ -1996,6 +1987,32 @@
 	} while (--a);
 }
 
+void Scumm_v5::o5_startMusic() {
+	_sound->addSoundToQueue(getVarOrDirectByte(0x80));
+}
+
+void Scumm_v5::o5_startSound() {
+	_vars[VAR_MUSIC_TIMER] = 0;
+	_sound->addSoundToQueue(getVarOrDirectByte(0x80));
+}
+
+void Scumm_v5::o5_stopMusic() {
+	_sound->stopAllSounds();
+}
+
+void Scumm_v5::o5_stopSound() {
+	_sound->stopSound(getVarOrDirectByte(0x80));
+}
+
+void Scumm_v5::o5_isSoundRunning() {
+	int snd;
+	getResultPos();
+	snd = getVarOrDirectByte(0x80);
+	if (snd)
+		snd = _sound->isSoundRunning(snd);
+	setResult(snd);
+}
+
 void Scumm_v5::o5_soundKludge() {
 	int items[16];
 	int i;
@@ -2020,10 +2037,6 @@
 	_sound->soundKludge(items, num);
 }
 
-void Scumm_v5::o5_startMusic() {
-	_sound->addSoundToQueue(getVarOrDirectByte(0x80));
-}
-
 void Scumm_v5::o5_startObject() {
 	int obj, script;
 	int data[16];
@@ -2054,15 +2067,6 @@
 	runScript(script, a, b, data);
 }
 
-void Scumm_v5::o5_startSound() {
-	_vars[VAR_MUSIC_TIMER] = 0;
-	_sound->addSoundToQueue(getVarOrDirectByte(0x80));
-}
-
-void Scumm_v5::o5_stopMusic() {
-	_sound->stopAllSounds();
-}
-
 void Scumm_v5::o5_stopObjectCode() {
 	stopObjectCode();
 }
@@ -2079,10 +2083,6 @@
 		stopObjectCode();
 	else
 		stopScriptNr(script);
-}
-
-void Scumm_v5::o5_stopSound() {
-	_sound->stopSound(getVarOrDirectByte(0x80));
 }
 
 void Scumm_v5::o5_stringOps() {