aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorTobia Tesan2017-05-01 00:17:24 +0200
committerEugene Sandulenko2017-05-02 21:01:23 +0100
commit8b9e029c1e661723ba0399b865c5b7b8ec542dd1 (patch)
treedb9f9aea0fe4723620997a8aa0ac3ef017b0a138 /engines
parent61cd407405777a85bd6f40b3c1b04d340d811c34 (diff)
downloadscummvm-rg350-8b9e029c1e661723ba0399b865c5b7b8ec542dd1.tar.gz
scummvm-rg350-8b9e029c1e661723ba0399b865c5b7b8ec542dd1.tar.bz2
scummvm-rg350-8b9e029c1e661723ba0399b865c5b7b8ec542dd1.zip
DIRECTOR: Remove now-useless textId parameter from renderButton
Diffstat (limited to 'engines')
-rw-r--r--engines/director/frame.cpp4
-rw-r--r--engines/director/frame.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 770617e6f9..af99248c04 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -595,7 +595,7 @@ void Frame::renderSprites(Graphics::ManagedSurface &surface, bool renderTrail) {
} else if (castType == kCastText) {
renderText(surface, i, NULL);
} else if (castType == kCastButton) {
- renderButton(surface, i, _vm->getVersion() < 4 ? _sprites[i]->_castId + 1024 : _sprites[i]->_buttonCast->children[0].index);
+ renderButton(surface, i);
} else {
if (!_sprites[i]->_bitmapCast) {
warning("No cast ID for sprite %d", i);
@@ -656,7 +656,7 @@ void Frame::renderShape(Graphics::ManagedSurface &surface, uint16 spriteId) {
inkBasedBlit(surface, tmpSurface, spriteId, shapeRect);
}
-void Frame::renderButton(Graphics::ManagedSurface &surface, uint16 spriteId, uint16 textId) {
+void Frame::renderButton(Graphics::ManagedSurface &surface, uint16 spriteId) {
uint16 castId = _sprites[spriteId]->_castId;
ButtonCast *button = _vm->getCurrentScore()->_loadedButtons->getVal(castId);
diff --git a/engines/director/frame.h b/engines/director/frame.h
index 546573fb40..e254171146 100644
--- a/engines/director/frame.h
+++ b/engines/director/frame.h
@@ -130,7 +130,7 @@ private:
void renderSprites(Graphics::ManagedSurface &surface, bool renderTrail);
void renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Common::Rect *textSize);
void renderShape(Graphics::ManagedSurface &surface, uint16 spriteId);
- void renderButton(Graphics::ManagedSurface &surface, uint16 spriteId, uint16 textId);
+ void renderButton(Graphics::ManagedSurface &surface, uint16 spriteId);
void readPaletteInfo(Common::SeekableSubReadStreamEndian &stream);
void readSprite(Common::SeekableSubReadStreamEndian &stream, uint16 offset, uint16 size);
void readMainChannels(Common::SeekableSubReadStreamEndian &stream, uint16 offset, uint16 size);