summaryrefslogtreecommitdiff
path: root/src/saveload
diff options
context:
space:
mode:
authoralberth <alberth@openttd.org>2009-06-01 11:43:36 +0000
committeralberth <alberth@openttd.org>2009-06-01 11:43:36 +0000
commitbab70a823dd810e1d4477f0c01d3a7b3e9b19ac8 (patch)
tree2668a1043fb310d44e67f4deb07871519d406a55 /src/saveload
parent5e91bf0ad20e0c60b31e190a1f02f184020238de (diff)
downloadopenttd-bab70a823dd810e1d4477f0c01d3a7b3e9b19ac8.tar.xz
(svn r16491) -Codechange: Added parentheses around bitwise operators for code style.
Diffstat (limited to 'src/saveload')
-rw-r--r--src/saveload/oldloader.cpp4
-rw-r--r--src/saveload/vehicle_sl.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp
index 25589a03c..ba26d66a2 100644
--- a/src/saveload/oldloader.cpp
+++ b/src/saveload/oldloader.cpp
@@ -105,8 +105,8 @@ bool LoadChunk(LoadgameState *ls, void *base, const OldChunks *chunks)
byte *base_ptr = (byte*)base;
for (const OldChunks *chunk = chunks; chunk->type != OC_END; chunk++) {
- if (((chunk->type & OC_TTD) && (_savegame_type == SGT_TTO)) ||
- ((chunk->type & OC_TTO) && (_savegame_type != SGT_TTO))) {
+ if (((chunk->type & OC_TTD) && _savegame_type == SGT_TTO) ||
+ ((chunk->type & OC_TTO) && _savegame_type != SGT_TTO)) {
/* TTD(P)-only chunk, but TTO savegame || TTO-only chunk, but TTD/TTDP savegame */
continue;
}
diff --git a/src/saveload/vehicle_sl.cpp b/src/saveload/vehicle_sl.cpp
index ae3b539e9..9c2610384 100644
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -165,7 +165,7 @@ void UpdateOldAircraft()
* skip those */
if (IsNormalAircraft(a)) {
/* airplane in terminal stopped doesn't hurt anyone, so goto next */
- if (a->vehstatus & VS_STOPPED && a->state == 0) {
+ if ((a->vehstatus & VS_STOPPED) && a->state == 0) {
a->state = HANGAR;
continue;
}