From c5ba9a0182771e860ec75a9c7f14962675b4a7d8 Mon Sep 17 00:00:00 2001 From: madbad Date: Sun, 12 Apr 2020 15:09:41 +0000 Subject: [PATCH] Revert "ff pausing test" This reverts commit 0ac616d96dc542ff2a3be457526c4ddbc403ab14. git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6914 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 6463ae72ab6a06ff7738e850970efb0279c1fb89 Former-commit-id: a96f5b9b82b588b223c5707cca90b725b42b6b91 --- src/libs/robottools/rthumandriver.cpp | 14 -------------- src/libs/tgfclient/forcefeedback.h | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/libs/robottools/rthumandriver.cpp b/src/libs/robottools/rthumandriver.cpp index 9e3829543..6b05f3053 100644 --- a/src/libs/robottools/rthumandriver.cpp +++ b/src/libs/robottools/rthumandriver.cpp @@ -260,10 +260,6 @@ static const int nbControl = sizeof(controlList) / sizeof(controlList[0]); static const std::string Yn[] = {HM_VAL_YES, HM_VAL_NO}; -//forcefeedback -//we will use this as a reference to know if the race engine is paused to disable force feedback in case the pause menu is activated -double forceFeedbackRaceEngineTime; - /* * Changes from original: * @@ -1227,16 +1223,6 @@ static void common_drive(const int index, tCarElt* car, tSituation *s) //send force feedback effect to the wheel //dont' even try to do it if steer command is on a keyboard because it somehow manage to crash (unable to identify the joystic to send FF to?) - - // Set the running flags. -// ReSituation::self().data()->_reRunning = 1; -// ReSituation::self().data()->s->_raceState &= ~RM_RACE_PAUSED; -// ReSituation::self().data()->_reState = RE_STATE_RACE; - -// if( s->raceInfo->_raceState != RM_RACE_PAUSED ){ - -//_reState = RE_STATE_RACE - if(cmd[CMD_LEFTSTEER].type != GFCTRL_TYPE_KEYBOARD){ // v<- this controller detenction does not make ->v // v<- sense to me ->v diff --git a/src/libs/tgfclient/forcefeedback.h b/src/libs/tgfclient/forcefeedback.h index e2f2c7393..37652cdc0 100644 --- a/src/libs/tgfclient/forcefeedback.h +++ b/src/libs/tgfclient/forcefeedback.h @@ -90,4 +90,4 @@ class TGFCLIENT_API ForceFeedbackManager { int globalMultiplier; }; -#endif // __forcefeedback_h__ +#endif // __forcefeedback_h__ \ No newline at end of file