Misc code cleanup again

This commit is contained in:
pagefault
2001-05-31 23:07:09 +00:00
parent 3274db2c95
commit a67b21328f

View File

@@ -1177,7 +1177,6 @@ int InitDirectDraw()
{ {
MessageBox(NULL, "IDirectDrawSurface7::GetAttachedSurface failed.", "DirectDraw Error", MB_ICONERROR); MessageBox(NULL, "IDirectDrawSurface7::GetAttachedSurface failed.", "DirectDraw Error", MB_ICONERROR);
} }
} }
else else
{ {
@@ -1202,6 +1201,7 @@ int InitDirectDraw()
} }
format.dwSize = sizeof(DDPIXELFORMAT); format.dwSize = sizeof(DDPIXELFORMAT);
if(DD_Primary->GetPixelFormat(&format) != DD_OK) if(DD_Primary->GetPixelFormat(&format) != DD_OK)
{ {
MessageBox(NULL, "IDirectDrawSurface7::GetPixelFormat failed.", "DirectDraw Error", MB_ICONERROR); MessageBox(NULL, "IDirectDrawSurface7::GetPixelFormat failed.", "DirectDraw Error", MB_ICONERROR);
@@ -1215,12 +1215,12 @@ int InitDirectDraw()
MessageBox(NULL,"ZSNESw does not support 24bit color.\nPlease change your resolution to either 16bit or 32bit color","Error",MB_OK); MessageBox(NULL,"ZSNESw does not support 24bit color.\nPlease change your resolution to either 16bit or 32bit color","Error",MB_OK);
exit(0); exit(0);
} }
converta = (BitDepth==16 && GBitMask!=0x07E0); converta = (BitDepth==16 && GBitMask!=0x07E0);
ddsd2.dwSize = sizeof(ddsd2); ddsd2.dwSize = sizeof(ddsd2);
ddsd2.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; ddsd2.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH;
ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; ddsd2.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN;
ddsd2.dwWidth = SurfaceX; ddsd2.dwWidth = SurfaceX;
ddsd2.dwHeight = SurfaceY; ddsd2.dwHeight = SurfaceY;
@@ -1296,6 +1296,7 @@ extern unsigned char romispal;
void Start60HZ(void) void Start60HZ(void)
{ {
update_ticks_pc2 = UPDATE_TICKS_UDP * freq / 1000; update_ticks_pc2 = UPDATE_TICKS_UDP * freq / 1000;
if(romispal==1) if(romispal==1)
{ {
update_ticks_pc = UPDATE_TICKS_GAMEPAL * freq / 1000; update_ticks_pc = UPDATE_TICKS_GAMEPAL * freq / 1000;
@@ -2315,7 +2316,6 @@ void WinUpdateDevices()
{ {
if(js[i].lRy<0) keys[0x100+i*32+7]=1; if(js[i].lRy<0) keys[0x100+i*32+7]=1;
} }
if(!RZ1Disable[i]) if(!RZ1Disable[i])
{ {
if(js[i].lRz>0) keys[0x100+i*32+8]=1; if(js[i].lRz>0) keys[0x100+i*32+8]=1;