just some compiler warning cleanup.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2562 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2009-03-05 22:35:06 +00:00
parent 3f840806b3
commit 02a4b49df1
9 changed files with 25 additions and 20 deletions

View File

@ -1158,7 +1158,7 @@ bool GCMemcard::format(bool New)
bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
{
u32 data_size = 0x2000 * (0x80 * 0x10 - 5);
u16 size = u16((((data_size / 0x2000) + 5) / 0x10));
u16 size = (u16)(((data_size / 0x2000) + 5) / 0x10);
SRAM m_SRAM;
FILE * pStream;
u64 time, rand;
@ -1183,15 +1183,14 @@ bool GCMemcard::formatWIP(int slot, bool New, bool sjis)
for(int i = 0; i < 12; i++)
{
rand = (((rand*(u64)0x0000000041c64e6d)+(u64)0x0000000000003039)>>16);
rand = (((rand*(u64)0x0000000041c64e6dULL)+(u64)0x0000000000003039ULL)>>16);
// PanicAlert("%16x",rand);
// PanicAlert("m_SRAM.syssramex.flash_id %16x",(flash_id[i]));
// PanicAlert("%16x",(flash_id[i]+(u32)rand));
// PanicAlert("%16x",(flash_id+Common::swap32((u32)rand)));
hdr.serial[i] = u8((flash_id[i]+(u32)rand));
rand = (((rand*(u64)0x0000000041c64e6d)+(u64)0x0000000000003039)>>16);
rand &= (u64)0x0000000000007fff;
rand = (((rand*(u64)0x0000000041c64e6dULL)+(u64)0x0000000000003039ULL)>>16);
rand &= (u64)0x0000000000007fffULL;
}
hdr.fmtTime.high = (time >> 32) & 0xFFFFFFFF;
hdr.fmtTime.low = time & 0xFFFFFFFF;