aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-09-02 17:29:48 +0000
committerMax Horn2004-09-02 17:29:48 +0000
commitfeb4d7950639819b5c8b723d5325b49e3305e36b (patch)
tree18d3487cb26aa417a9bc9a6470b8a47ffeaef692
parent56c1c5cbaec69c258eaab26fbe55f82db95fd2a8 (diff)
downloadscummvm-rg350-feb4d7950639819b5c8b723d5325b49e3305e36b.tar.gz
scummvm-rg350-feb4d7950639819b5c8b723d5325b49e3305e36b.tar.bz2
scummvm-rg350-feb4d7950639819b5c8b723d5325b49e3305e36b.zip
cleanup
svn-id: r14866
-rw-r--r--scumm/debugger.cpp4
-rw-r--r--scumm/scumm.h1
2 files changed, 2 insertions, 3 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index 17df7b036f..422ed1f13f 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -161,8 +161,8 @@ bool ScummDebugger::Cmd_IMuse(int argc, const char **argv) {
if (argc > 2 && (!strcmp(argv[2], "random") || atoi(argv[2]) != 0)) {
int sound = atoi(argv[2]);
if (!strcmp(argv[2], "random")) {
- DebugPrintf("Selecting from %d songs...\n", _vm->getNumSounds());
- sound = _vm->_rnd.getRandomNumber(_vm->getNumSounds());
+ DebugPrintf("Selecting from %d songs...\n", _vm->_numSounds);
+ sound = _vm->_rnd.getRandomNumber(_vm->_numSounds);
}
_vm->ensureResourceLoaded(rtSound, sound);
_vm->_musicEngine->startSound(sound);
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 4cd8f1661f..abb281d017 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -485,7 +485,6 @@ public:
int _numCostumes; // FIXME - should be protected, used by Actor::remapActorPalette
int _numCharsets; // FIXME - should be protected, used by CharsetRenderer
- int getNumSounds() const { return _numSounds; }
BaseCostumeRenderer* _costumeRenderer;
char *_audioNames;