From 8f3b2e9b4d9f1f82682e1eed018153091cddee9f Mon Sep 17 00:00:00 2001 From: Robin Watts Date: Sat, 29 Nov 2008 18:01:16 +0000 Subject: Remove warnings from NDS build. svn-id: r35172 --- engines/scumm/resource_v2.cpp | 5 +++-- engines/scumm/saveload.cpp | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'engines/scumm') diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp index 323aff849e..76e451183f 100644 --- a/engines/scumm/resource_v2.cpp +++ b/engines/scumm/resource_v2.cpp @@ -194,10 +194,11 @@ void ScummEngine_v2::readIndexFile() { break; case 0x132: printf("C64 V1 game detected\n"); - if (_game.id == GID_MANIAC) + if (_game.id == GID_MANIAC) { assert(_game.version == 0); - else + } else { assert(_game.version == 1); + } readClassicIndexFile(); break; case 0x032: diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index 5fdd340fc9..577e338384 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -644,8 +644,8 @@ void ScummEngine::saveInfos(Common::WriteStream* file) { tm curTime; _system->getTimeAndDate(curTime); - section.date = (curTime.tm_mday & 0xFF) << 24 | ((curTime.tm_mon + 1) & 0xFF) << 16 | (curTime.tm_year + 1900) & 0xFFFF; - section.time = (curTime.tm_hour & 0xFF) << 8 | (curTime.tm_min) & 0xFF; + section.date = ((curTime.tm_mday & 0xFF) << 24) | (((curTime.tm_mon + 1) & 0xFF) << 16) | ((curTime.tm_year + 1900) & 0xFFFF); + section.time = ((curTime.tm_hour & 0xFF) << 8) | ((curTime.tm_min) & 0xFF); file->writeUint32BE(section.type); file->writeUint32BE(section.version); -- cgit v1.2.3