From 018e304916c8086a721ba54fa020a09dc00d069d Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sat, 6 Aug 2011 03:26:40 +0200
Subject: SCUMM: Slight cleanup in CMS code.

---
 engines/scumm/player_v2cms.cpp | 6 +++---
 engines/scumm/player_v2cms.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/player_v2cms.cpp b/engines/scumm/player_v2cms.cpp
index 96a1ba1332..9908ba5253 100644
--- a/engines/scumm/player_v2cms.cpp
+++ b/engines/scumm/player_v2cms.cpp
@@ -149,7 +149,7 @@ Player_V2CMS::Player_V2CMS(ScummEngine *scumm, Audio::Mixer *mixer)
 	_midiDelay = _octaveMask = _looping = _tempo = _tempoSum = 0;
 	_midiData = _midiSongBegin = 0;
 	_musicTimer = _musicTimerTicks = 0;
-	_clkFrequenz = 0;
+	_voiceTimer = 0;
 	_loadedMidiSong = 0;
 	_outputTableReady = 0;
 	memset(_midiChannel, 0, sizeof(Voice2*)*16);
@@ -434,8 +434,8 @@ int Player_V2CMS::readBuffer(int16 *buffer, const int numSamples) {
 	do {
 		if (!(_next_tick >> FIXP_SHIFT)) {
 			if (_midiData) {
-				--_clkFrequenz;
-				if (!(_clkFrequenz & 0x01))
+				--_voiceTimer;
+				if (!(_voiceTimer & 0x01))
 					playVoice();
 
 				int newTempoSum = _tempo + _tempoSum;
diff --git a/engines/scumm/player_v2cms.h b/engines/scumm/player_v2cms.h
index ba2c3f25d8..f8a6642ff4 100644
--- a/engines/scumm/player_v2cms.h
+++ b/engines/scumm/player_v2cms.h
@@ -128,7 +128,7 @@ protected:
 
 	byte _lastMidiCommand;
 	uint _outputTableReady;
-	byte _clkFrequenz;
+	byte _voiceTimer;
 	byte _restart;
 	byte _curSno;
 
-- 
cgit v1.2.3