diff options
| author | aap <aap@papnet.eu> | 2019-06-30 13:37:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-30 13:37:52 +0200 |
| commit | 9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (patch) | |
| tree | 3ca33433362742fad0a4342b1047f992c70602c9 /src/Pad.cpp | |
| parent | Merge pull request #77 from Nick007J/master (diff) | |
| parent | Cleanup project a bit (diff) | |
| download | re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.gz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.bz2 re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.lz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.xz re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.tar.zst re3-9b5a7cd4bb6d106e10e4502f123814f4ece44a2f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/Pad.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Pad.cpp b/src/Pad.cpp index e6f36efd..13b9b589 100644 --- a/src/Pad.cpp +++ b/src/Pad.cpp @@ -187,10 +187,10 @@ CMouseControllerState CMousePointerStateHelper::GetMouseSetUp() { CMouseControllerState state; - if ( PSGLOBAL(mouse) == NULL ) + if ( PSGLOBAL(mouse) == nil ) _InputInitialiseMouse(); - if ( PSGLOBAL(mouse) != NULL ) + if ( PSGLOBAL(mouse) != nil ) { DIDEVCAPS devCaps; devCaps.dwSize = sizeof(DIDEVCAPS); @@ -228,12 +228,12 @@ void CPad::UpdateMouse() { if ( IsForegroundApp() ) { - if ( PSGLOBAL(mouse) == NULL ) + if ( PSGLOBAL(mouse) == nil ) _InputInitialiseMouse(); DIMOUSESTATE2 state; - if ( PSGLOBAL(mouse) != NULL && SUCCEEDED(_InputGetMouseState(&state)) ) + if ( PSGLOBAL(mouse) != nil && SUCCEEDED(_InputGetMouseState(&state)) ) { int32 signX = 1; int32 signy = 1; @@ -386,7 +386,7 @@ void CPad::StartShake_Train(float fX, float fY) if ( CCutsceneMgr::IsRunning() || CGame::playingIntro ) return; - if (FindPlayerVehicle() != NULL && FindPlayerVehicle()->IsTrain() ) + if (FindPlayerVehicle() != nil && FindPlayerVehicle()->IsTrain() ) return; float fDist = ( TheCamera.GetPosition() - CVector(fX, fY, 0.0f) ).Magnitude2D(); @@ -1822,7 +1822,7 @@ char *CPad::EditString(char *pStr, int32 nSize) // extenter/up/down if ( GetPad(0)->GetEnterJustDown() || GetPad(0)->GetUpJustDown() || GetPad(0)->GetDownJustDown() ) - return NULL; + return nil; return pStr; } |