More code cleanups

This commit is contained in:
pagefault
2001-05-31 23:31:09 +00:00
parent 240ef1dea2
commit 25fdb967a8

View File

@@ -276,14 +276,12 @@ aquireagain:;
} }
} }
if(SUCCEEDED(hr)) if(SUCCEEDED(hr))
{ {
MouseMoveX=dims.lX; MouseMoveX=dims.lX;
MouseMoveY=dims.lY; MouseMoveY=dims.lY;
if (MouseWheel == 1) if(MouseWheel == 1)
{ {
long zDelta = dims.lZ-PrevZ; long zDelta = dims.lZ-PrevZ;
if (!dims.lZ) zDelta=0; if (!dims.lZ) zDelta=0;
@@ -2368,12 +2366,11 @@ void WinUpdateDevices()
int GetMouseX(void) int GetMouseX(void)
{ {
char message1[256];
InputRead(); InputRead();
MouseX+=MouseMoveX; MouseX+=MouseMoveX;
if(MouseX>MouseMaxX) if(MouseX>MouseMaxX)
{ {
if(abs(MouseMoveX)>10&&T36HZEnabled) if(abs(MouseMoveX)>10&&T36HZEnabled&&(FullScreen==0))
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X+WindowWidth+32,Y+(MouseY*WindowHeight/224)); SetCursorPos(X+WindowWidth+32,Y+(MouseY*WindowHeight/224));
@@ -2383,7 +2380,7 @@ int GetMouseX(void)
if(MouseX<MouseMinX) if(MouseX<MouseMinX)
{ {
if(abs(MouseMoveX)>10&&T36HZEnabled) if(abs(MouseMoveX)>10&&T36HZEnabled&&(FullScreen==0))
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X-32,Y+(MouseY*WindowHeight/224)); SetCursorPos(X-32,Y+(MouseY*WindowHeight/224));
@@ -2391,7 +2388,6 @@ int GetMouseX(void)
MouseX=MouseMinX; MouseX=MouseMinX;
} }
return((int)MouseX); return((int)MouseX);
// return(100);
} }
int GetMouseY(void) int GetMouseY(void)
@@ -2400,7 +2396,7 @@ int GetMouseY(void)
if(MouseY>MouseMaxY) if(MouseY>MouseMaxY)
{ {
MouseY=MouseMaxY; MouseY=MouseMaxY;
if(abs(MouseMoveY)>10&&T36HZEnabled) if(abs(MouseMoveY)>10&&T36HZEnabled&&(FullScreen==0))
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X+(MouseX*WindowWidth/256), Y+WindowHeight+32); SetCursorPos(X+(MouseX*WindowWidth/256), Y+WindowHeight+32);
@@ -2409,15 +2405,13 @@ int GetMouseY(void)
if(MouseY<MouseMinY) if(MouseY<MouseMinY)
{ {
MouseY=MouseMinY; MouseY=MouseMinY;
if(abs(MouseMoveY)>10&&T36HZEnabled) if(abs(MouseMoveY)>10&&T36HZEnabled&&(FullScreen==0))
{ {
MouseInput->Unacquire(); MouseInput->Unacquire();
SetCursorPos(X+(MouseX*WindowWidth/256), Y-32); SetCursorPos(X+(MouseX*WindowWidth/256), Y-32);
} }
} }
return((int)MouseY); return((int)MouseY);
// return(100);
} }
int GetMouseMoveX(void) int GetMouseMoveX(void)