[Scummvm-cvs-logs] CVS: scummvm/scumm debugger.cpp,1.128,1.129 scumm.h,1.462,1.463
Max Horn
fingolfin at users.sourceforge.net
Thu Sep 2 10:31:43 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16810
Modified Files:
debugger.cpp scumm.h
Log Message:
cleanup
Index: debugger.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/debugger.cpp,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- debugger.cpp 28 Aug 2004 03:18:51 -0000 1.128
+++ debugger.cpp 2 Sep 2004 17:29:48 -0000 1.129
@@ -161,8 +161,8 @@
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);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.462
retrieving revision 1.463
diff -u -d -r1.462 -r1.463
--- scumm.h 2 Sep 2004 03:54:29 -0000 1.462
+++ scumm.h 2 Sep 2004 17:29:48 -0000 1.463
@@ -485,7 +485,6 @@
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;
More information about the Scummvm-git-logs
mailing list