From be6c0584240caf420b2475a0be036391e842e8af Mon Sep 17 00:00:00 2001 From: alberth Date: Sat, 24 Jul 2010 10:14:39 +0000 Subject: (svn r20211) -Codechange: Indented code should have curly braces around it. --- src/saveload/saveload.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/saveload/saveload.cpp') diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index c44703157..ac37c9566 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -409,8 +409,9 @@ static uint SlReadSimpleGamma() i &= ~0x40; if (HasBit(i, 5)) { i &= ~0x20; - if (HasBit(i, 4)) + if (HasBit(i, 4)) { SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME, "Unsupported gamma"); + } i = (i << 8) | SlReadByte(); } i = (i << 8) | SlReadByte(); @@ -538,8 +539,9 @@ void SlSetLength(size_t length) break; case CH_ARRAY: assert(_sl.last_array_index <= _sl.array_index); - while (++_sl.last_array_index <= _sl.array_index) + while (++_sl.last_array_index <= _sl.array_index) { SlWriteArrayLength(1); + } SlWriteArrayLength(length + 1); break; case CH_SPARSE_ARRAY: @@ -1520,8 +1522,7 @@ static size_t ReadZlib() /* inflate the data */ r = inflate(&_z, 0); - if (r == Z_STREAM_END) - break; + if (r == Z_STREAM_END) break; if (r != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "inflate() failed"); } while (_z.avail_out); @@ -1569,8 +1570,8 @@ static void WriteZlibLoop(z_streamp z, byte *p, size_t len, int mode) if ((n = sizeof(buf) - z->avail_out) != 0) { if (fwrite(buf, n, 1, _sl.fh) != 1) SlError(STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE); } - if (r == Z_STREAM_END) - break; + if (r == Z_STREAM_END) break; + if (r != Z_OK) SlError(STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR, "zlib returned error code"); } while (z->avail_in || !z->avail_out); } -- cgit v1.2.3-54-g00ecf