diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2019-06-30 16:55:16 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2019-06-30 16:55:16 +0200 |
| commit | e650c06acd17d6440fbc31bd9dc150d6dd17c45b (patch) | |
| tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/Pad.cpp | |
| parent | Merge branch 'master' of git://github.com/GTAmodding/re3 into erorcun (diff) | |
| parent | Merge pull request #79 from Nick007J/master (diff) | |
| download | re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.gz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.bz2 re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.lz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.xz re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.tar.zst re3-e650c06acd17d6440fbc31bd9dc150d6dd17c45b.zip | |
Diffstat (limited to 'src/Pad.cpp')
| -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; } |