ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed a few compiler warnings. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2555 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marcus Wanners 2009-03-05 02:11:37 +00:00
parent 20186db587
commit 0b6bf51c9a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/DolphinWX/Src/MemoryCards/GCMemcard.cpp
View File

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

4
Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
View File

@ -486,8 +486,8 @@ void UpdateViewport()
vp.MinZ = (xfregs.rawViewport[5] - xfregs.rawViewport[2])/16777215.0f; vp.MinZ = (xfregs.rawViewport[5] - xfregs.rawViewport[2])/16777215.0f;
vp.MaxZ = xfregs.rawViewport[5]/16777215.0f; vp.MaxZ = xfregs.rawViewport[5]/16777215.0f;
wid = ceil(fabs(2 * xfregs.rawViewport[0])); wid = int(ceil(fabs(2 * xfregs.rawViewport[0])));
hei = ceil(fabs(2 * xfregs.rawViewport[1])); hei = int(ceil(fabs(2 * xfregs.rawViewport[1])));
vp.X = (int)(xfregs.rawViewport[3] - xfregs.rawViewport[0] - 342 - scissorXOff) + xoffs; vp.X = (int)(xfregs.rawViewport[3] - xfregs.rawViewport[0] - 342 - scissorXOff) + xoffs;
vp.Y = (int)(xfregs.rawViewport[4] - xfregs.rawViewport[1] - 342 - scissorYOff) + yoffs; vp.Y = (int)(xfregs.rawViewport[4] - xfregs.rawViewport[1] - 342 - scissorYOff) + yoffs;

4
Source/Plugins/Plugin_Wiimote/Src/EmuMain.cpp
View File

@ -152,8 +152,8 @@ void GetMousePos(float& x, float& y)
PictureHeight = PictureHeight * Ratio; PictureHeight = PictureHeight * Ratio;
// Adjust the X and Y offset // Adjust the X and Y offset
XOffset = XOffset - (IncreasedWidth / 2.0); XOffset = float(XOffset - (IncreasedWidth / 2.0));
YOffset = YOffset - (IncreasedHeight / 2.0); YOffset = float(YOffset - (IncreasedHeight / 2.0));
// Logging // Logging
/* /*