diff options
| author | Max Horn | 2009-09-25 09:13:33 +0000 |
|---|---|---|
| committer | Max Horn | 2009-09-25 09:13:33 +0000 |
| commit | adaf3ec8b4818f89e9f4d39fb2a14710b0f0bd5b (patch) | |
| tree | e964d10131c5d341df8ad96b792eca36ab3ea126 /engines/scumm/scumm.cpp | |
| parent | 07092bfccbfdbb5e01cb99068f36229055e56df6 (diff) | |
| download | scummvm-rg350-adaf3ec8b4818f89e9f4d39fb2a14710b0f0bd5b.tar.gz scummvm-rg350-adaf3ec8b4818f89e9f4d39fb2a14710b0f0bd5b.tar.bz2 scummvm-rg350-adaf3ec8b4818f89e9f4d39fb2a14710b0f0bd5b.zip | |
SCUMM: Rename _bitDepth to _bytesPerPixel
svn-id: r44336
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 13a12c5480..74fa7ab9a3 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -254,7 +254,7 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _switchRoomEffect2 = 0; _switchRoomEffect = 0; - _bitDepth = 0; + _bytesPerPixel = 1; _doEffect = false; _snapScroll = false; _currentLights = 0; @@ -528,11 +528,11 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr) _screenHeight = 200; } - _bitDepth = (_game.features & GF_16BIT_COLOR) ? 2 : 1; + _bytesPerPixel = (_game.features & GF_16BIT_COLOR) ? 2 : 1; // Allocate gfx compositing buffer (not needed for V7/V8 games). if (_game.version < 7) - _compositeBuf = (byte *)malloc(_screenWidth * _screenHeight * _bitDepth); + _compositeBuf = (byte *)malloc(_screenWidth * _screenHeight * _bytesPerPixel); else _compositeBuf = 0; @@ -1225,7 +1225,7 @@ void ScummEngine::setupScumm() { } free(_compositeBuf); - _compositeBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier * _bitDepth); + _compositeBuf = (byte *)malloc(_screenWidth * _textSurfaceMultiplier * _screenHeight * _textSurfaceMultiplier * _bytesPerPixel); } #ifdef ENABLE_SCUMM_7_8 |