aboutsummaryrefslogtreecommitdiff
path: root/engines/wintermute/base/file/base_disk_file.cpp
diff options
context:
space:
mode:
authorEinar Johan Trøan Sømåen2012-07-26 15:59:26 +0200
committerEinar Johan Trøan Sømåen2012-07-26 15:59:26 +0200
commitef11f9d0c53cbdd9d88a99143de6f43f34d7e24d (patch)
tree8dfaee0ba16e18a8e3772dd5afc9123d5c4e78d2 /engines/wintermute/base/file/base_disk_file.cpp
parent38507fa9895620639d8733dbb4e085dfb2282a33 (diff)
downloadscummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.gz
scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.tar.bz2
scummvm-rg350-ef11f9d0c53cbdd9d88a99143de6f43f34d7e24d.zip
WINTERMUTE: Run Astyle with add-braces to break one-line statements into easier-to-read-code.
Diffstat (limited to 'engines/wintermute/base/file/base_disk_file.cpp')
-rw-r--r--engines/wintermute/base/file/base_disk_file.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/engines/wintermute/base/file/base_disk_file.cpp b/engines/wintermute/base/file/base_disk_file.cpp
index bb8504d2f4..7d805aedb5 100644
--- a/engines/wintermute/base/file/base_disk_file.cpp
+++ b/engines/wintermute/base/file/base_disk_file.cpp
@@ -41,7 +41,9 @@ namespace WinterMute {
void correctSlashes(char *fileName) {
for (size_t i = 0; i < strlen(fileName); i++) {
- if (fileName[i] == '\\') fileName[i] = '/';
+ if (fileName[i] == '\\') {
+ fileName[i] = '/';
+ }
}
}
@@ -51,8 +53,9 @@ static Common::FSNode getNodeForRelativePath(const Common::String &filename) {
// specifies to follow the Windows-convention of folder\subfolder\file (absolute paths should not happen)
// Absolute path: TODO: Add specific fallbacks here.
- if (filename.contains(':'))
+ if (filename.contains(':')) {
error("openDiskFile::Absolute path or invalid filename used in %s", filename.c_str());
+ }
// Relative path:
if (filename.contains('\\')) {
@@ -132,7 +135,9 @@ Common::SeekableReadStream *openDiskFile(const Common::String &filename) {
magic2 = file->readUint32LE();
bool compressed = false;
- if (magic1 == DCGF_MAGIC && magic2 == COMPRESSED_FILE_MAGIC) compressed = true;
+ if (magic1 == DCGF_MAGIC && magic2 == COMPRESSED_FILE_MAGIC) {
+ compressed = true;
+ }
if (compressed) {
uint32 dataOffset, compSize, uncompSize;