aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/actor.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2008-12-06 13:35:27 +0000
committerFilippos Karapetis2008-12-06 13:35:27 +0000
commitf3a60a8c96fed196b64cc9b86d71eeac00df5871 (patch)
treeeb93711660aafd9bcae723fd70c6f988624896ac /engines/saga/actor.cpp
parente625bd54de1fdb67a66de9c400fefe2bfedeb7c5 (diff)
downloadscummvm-rg350-f3a60a8c96fed196b64cc9b86d71eeac00df5871.tar.gz
scummvm-rg350-f3a60a8c96fed196b64cc9b86d71eeac00df5871.tar.bz2
scummvm-rg350-f3a60a8c96fed196b64cc9b86d71eeac00df5871.zip
Cleanup
svn-id: r35259
Diffstat (limited to 'engines/saga/actor.cpp')
-rw-r--r--engines/saga/actor.cpp18
1 files changed, 5 insertions, 13 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp
index 52c07faca3..5f099f88da 100644
--- a/engines/saga/actor.cpp
+++ b/engines/saga/actor.cpp
@@ -1046,10 +1046,7 @@ void Actor::drawActors() {
CommonObjectDataPointer drawObject;
int frameNumber = 0;
SpriteList *spriteList = NULL;
-
- Surface *backBuffer;
-
- backBuffer = _vm->_gfx->getBackBuffer();
+ Surface *backBuffer = _vm->_gfx->getBackBuffer();
createDrawOrderList();
@@ -1076,17 +1073,12 @@ void Actor::drawSpeech(void) {
|| (!_vm->_subtitlesEnabled && (_vm->getGameType() == GType_IHNM)))
return;
- int i;
Point textPoint;
ActorData *actor;
int width, height;
- int stringLength;
- Surface *backBuffer;
- char *outputString;
-
- backBuffer = _vm->_gfx->getBackBuffer();
- stringLength = strlen(_activeSpeech.strings[0]);
- outputString = (char*)calloc(stringLength + 1, 1);
+ Surface *backBuffer = _vm->_gfx->getBackBuffer();
+ int stringLength = strlen(_activeSpeech.strings[0]);
+ char *outputString = (char*)calloc(stringLength + 1, 1);
if (_activeSpeech.speechFlags & kSpeakSlow)
strncpy(outputString, _activeSpeech.strings[0], _activeSpeech.slowModeCharIndex + 1);
@@ -1097,7 +1089,7 @@ void Actor::drawSpeech(void) {
height = _vm->_font->getHeight(kKnownFontScript);
width = _vm->_font->getStringWidth(kKnownFontScript, _activeSpeech.strings[0], 0, kFontNormal);
- for (i = 0; i < _activeSpeech.actorsCount; i++) {
+ for (int i = 0; i < _activeSpeech.actorsCount; i++) {
actor = getActor(_activeSpeech.actorIds[i]);
calcScreenPosition(actor);