aboutsummaryrefslogtreecommitdiff
path: root/scumm/scumm.cpp
diff options
context:
space:
mode:
authorMax Horn2005-04-20 23:33:35 +0000
committerMax Horn2005-04-20 23:33:35 +0000
commit7963bb4cb92345948b8f737df8414929f93db527 (patch)
treed89bb97667bb09fb515e3c59a15ecbd37e04f77e /scumm/scumm.cpp
parentc04ad861fe751503c978cd47258baaa57c22b96d (diff)
downloadscummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.tar.gz
scummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.tar.bz2
scummvm-rg350-7963bb4cb92345948b8f737df8414929f93db527.zip
Renamed _mouseButStat -> _mouseAndKeyboardStat (that's what it really is); moved _audioNames to class IMuseDigital
svn-id: r17723
Diffstat (limited to 'scumm/scumm.cpp')
-rw-r--r--scumm/scumm.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index afe1964bd6..2ce332b2f2 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -755,8 +755,6 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_numTalkies = 0;
_numPalettes = 0;
_numUnk = 0;
- _audioNames = NULL;
- _numAudioNames = 0;
_curActor = 0;
_curVerb = 0;
_curVerbSlot = 0;
@@ -765,7 +763,7 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
_egoPositioned = false;
_keyPressed = 0;
_lastKeyHit = 0;
- _mouseButStat = 0;
+ _mouseAndKeyboardStat = 0;
_leftBtnPressed = 0;
_rightBtnPressed = 0;
_bootParam = 0;
@@ -1173,7 +1171,6 @@ ScummEngine::~ScummEngine() {
delete _sound;
free(_languageBuffer);
- free(_audioNames);
delete _costumeLoader;
delete _costumeRenderer;