diff options
author | Johannes Schickel | 2009-03-30 12:11:22 +0000 |
---|---|---|
committer | Johannes Schickel | 2009-03-30 12:11:22 +0000 |
commit | c8aec4c696b38aa19c2234aa55db9e7920833b32 (patch) | |
tree | ef8b9cdf9621721cd699c5c7675e9cac7e3498e4 /engines/sword1/control.cpp | |
parent | 67a881f44402a3b0110d837270e113ead0211753 (diff) | |
download | scummvm-rg350-c8aec4c696b38aa19c2234aa55db9e7920833b32.tar.gz scummvm-rg350-c8aec4c696b38aa19c2234aa55db9e7920833b32.tar.bz2 scummvm-rg350-c8aec4c696b38aa19c2234aa55db9e7920833b32.zip |
SWORD1: Commit of parentheses patch from salty-horse. (from -devel "Enabling -Wparentheses in the Makefile").
svn-id: r39762
Diffstat (limited to 'engines/sword1/control.cpp')
-rw-r--r-- | engines/sword1/control.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword1/control.cpp b/engines/sword1/control.cpp index 974faa350c..ac7105c2dd 100644 --- a/engines/sword1/control.cpp +++ b/engines/sword1/control.cpp @@ -1112,8 +1112,8 @@ void Control::saveGameToFile(uint8 slot) { tm curTime; _system->getTimeAndDate(curTime); - uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF; - uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF; + uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | ((curTime.tm_year + 1900) & 0xFFFF); + uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | ((curTime.tm_min) & 0xFF); outf->writeUint32BE(saveDate); outf->writeUint16BE(saveTime); @@ -1278,8 +1278,8 @@ bool Control::convertSaveGame(uint8 slot, char* desc) { tm curTime; _system->getTimeAndDate(curTime); - uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF; - uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF; + uint32 saveDate = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | ((curTime.tm_year + 1900) & 0xFFFF); + uint16 saveTime = (curTime.tm_hour & 0xFF) << 8 | ((curTime.tm_min) & 0xFF); newSave->writeUint32BE(saveDate); newSave->writeUint16BE(saveTime); |