From 22f72fc2a71891368799f1400ab8278d0f8c1d7f Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 4 Jul 2016 22:34:42 +0200 Subject: DIRECTOR: Lingo: Optimise 'the' setters and getters. --- engines/director/lingo/lingo-the.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/engines/director/lingo/lingo-the.cpp b/engines/director/lingo/lingo-the.cpp index f772d0490f..4d54110489 100644 --- a/engines/director/lingo/lingo-the.cpp +++ b/engines/director/lingo/lingo-the.cpp @@ -163,6 +163,8 @@ void Lingo::setTheEntity(TheEntity entity, int id, TheField field, Datum &d) { void Lingo::setTheSprite(int id, TheField field, Datum &d) { Sprite *sprite = _vm->_currentScore->getSpriteById(id); + d.toInt(); // Enforce Integer + switch (field) { case kTheCastNum: if (_vm->_currentScore->_casts.contains(d.u.i)) { @@ -208,25 +210,23 @@ Datum Lingo::getTheEntity(TheEntity entity, int id, TheField field) { Datum Lingo::getTheSprite(int id, TheField field) { Datum d; Sprite *sprite = _vm->_currentScore->getSpriteById(id); + + d.type = INT; + switch (field) { case kTheCastNum: - d.type = INT; d.u.i = sprite->_castId; break; case kTheWidth: - d.type = INT; d.u.i = sprite->_width; break; case kTheHeight: - d.type = INT; d.u.i = sprite->_height; break; case kTheTrails: - d.type = INT; d.u.i = sprite->_trails; break; case kTheInk: - d.type = INT; d.u.i = sprite->_ink; break; default: -- cgit v1.2.3