aboutsummaryrefslogtreecommitdiff
path: root/engines/access
diff options
context:
space:
mode:
authorStrangerke2014-12-17 07:47:55 +0100
committerStrangerke2014-12-17 07:47:55 +0100
commit3a1203ff734f7923042ed0b5ab96a460e72369ec (patch)
tree55435e1d311ba6c25f4a0b3ccc69ded0ebefaa21 /engines/access
parent7ae4fca38e792e8d27664d58562eafe6bd049a4d (diff)
downloadscummvm-rg350-3a1203ff734f7923042ed0b5ab96a460e72369ec.tar.gz
scummvm-rg350-3a1203ff734f7923042ed0b5ab96a460e72369ec.tar.bz2
scummvm-rg350-3a1203ff734f7923042ed0b5ab96a460e72369ec.zip
ACCESS: Use a while statement as suggested by _sev in the merge request
Also fix a formatting issue pointed out by _sev
Diffstat (limited to 'engines/access')
-rw-r--r--engines/access/access.cpp10
1 files changed, 3 insertions, 7 deletions
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
index b67aebfcc0..c0f8905681 100644
--- a/engines/access/access.cpp
+++ b/engines/access/access.cpp
@@ -248,10 +248,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
break;
}
- if (soundsLeft == 0)
- return;
-
- for (;;) {
+ while (soundsLeft) {
_sound->freeSounds();
Resource *res = _sound->loadSound(_narateFile + 99, _sndSubFile);
_sound->_soundTable.push_back(SoundEntry(res, 1));
@@ -270,8 +267,6 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
} else {
++_sndSubFile;
--soundsLeft;
- if (soundsLeft == 0)
- break;
}
}
}
@@ -519,7 +514,8 @@ bool AccessEngine::readSavegameHeader(Common::InSaveFile *in, AccessSavegameHead
// Read in the string
header._saveName.clear();
char ch;
- while ((ch = (char)in->readByte()) != '\0') header._saveName += ch;
+ while ((ch = (char)in->readByte()) != '\0')
+ header._saveName += ch;
// Get the thumbnail
header._thumbnail = Graphics::loadThumbnail(*in);