aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobia Tesan2017-04-29 23:02:11 +0200
committerEugene Sandulenko2017-04-30 09:48:08 +0200
commit03831698ac508a4cb210fb6835565782f7a49a08 (patch)
tree48faf56f4ff9fd0777d1fff0269e26100c50cd19
parent132785ccb05db73da8d4cbe420acf55e2bc9e581 (diff)
downloadscummvm-rg350-03831698ac508a4cb210fb6835565782f7a49a08.tar.gz
scummvm-rg350-03831698ac508a4cb210fb6835565782f7a49a08.tar.bz2
scummvm-rg350-03831698ac508a4cb210fb6835565782f7a49a08.zip
DIRECTOR: remove redundant/ineffective assignments to width
-rw-r--r--engines/director/frame.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 30be86739c..ec22cc1580 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -747,17 +747,14 @@ void Frame::renderText(Graphics::ManagedSurface &surface, uint16 spriteId, Commo
int height = textCast->initialRect.height(); //_sprites[spriteId]->_height;
int width;
- if (_vm->getVersion() >= 4 && textSize != NULL)
- width = textCast->initialRect.right;
- else
- width = textCast->initialRect.width(); //_sprites[spriteId]->_width;
-
if (_vm->getVersion() >= 4) {
if (textSize == NULL)
width = textCast->initialRect.right;
else {
width = textSize->width();
}
+ } else {
+ width = textCast->initialRect.width(); //_sprites[spriteId]->_width;
}
if (_vm->getCurrentScore()->_fontMap.contains(textCast->fontId)) {