summaryrefslogtreecommitdiff
path: root/src/misc
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-08-20 10:23:39 +0000
committerrubidium <rubidium@openttd.org>2009-08-20 10:23:39 +0000
commit7fb95e2c2b2f84ecf9b5d5d2f02b147d1ad7cb3d (patch)
treefeb24d4a4f522305f7df61aaf26c499eb38c6b6c /src/misc
parent0188ebad5649d4c698245a2fef9039e6155b5f22 (diff)
downloadopenttd-7fb95e2c2b2f84ecf9b5d5d2f02b147d1ad7cb3d.tar.xz
(svn r17228) -Codechange: some coding style fixes
Diffstat (limited to 'src/misc')
-rw-r--r--src/misc/binaryheap.hpp3
-rw-r--r--src/misc/blob.hpp7
2 files changed, 6 insertions, 4 deletions
diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp
index 7fce75356..d80a0ce26 100644
--- a/src/misc/binaryheap.hpp
+++ b/src/misc/binaryheap.hpp
@@ -185,8 +185,7 @@ inline void CBinaryHeapT<Titem_>::RemoveByIdx(int idx)
}
/* move parent to the proper place */
if (m_size > 0) m_items[gap] = &last;
- }
- else {
+ } else {
assert(idx == m_size);
m_size--;
}
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index 5403adcce..9c68d9db9 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -240,8 +240,11 @@ public:
{
if (MaxRawSize() > 0 && num_bytes > 0) {
assert(num_bytes <= RawSize());
- if (num_bytes < RawSize()) RawSizeRef() -= num_bytes;
- else RawSizeRef() = 0;
+ if (num_bytes < RawSize()) {
+ RawSizeRef() -= num_bytes;
+ } else {
+ RawSizeRef() = 0;
+ }
}
}