This commit is contained in:
Daveo 2001-08-14 12:57:28 +00:00
parent eb79d0571a
commit db91ce2d99
2 changed files with 5 additions and 0 deletions

View file

@ -31,6 +31,7 @@
#endif #endif
#include "system\vid.h" #include "system\vid.h"
#include "pad\vibe.h"
/* Std Lib /* Std Lib
------- */ ------- */
@ -237,6 +238,7 @@ void CFader::setFadingOut(FADE_STYLE _style)
s_fadeMode=FADING_OUT; s_fadeMode=FADING_OUT;
s_fadeStyle=_style; s_fadeStyle=_style;
s_waitFrames=FRAMES_TO_WAIT; s_waitFrames=FRAMES_TO_WAIT;
CPadVibrationManager::stopAllVibration();
} }
@ -258,6 +260,7 @@ void CFader::setFadingIn(FADE_STYLE _style)
s_fadeStyle=_style; s_fadeStyle=_style;
s_fadeMode=PAUSE_BEFORE_FADING_IN; s_fadeMode=PAUSE_BEFORE_FADING_IN;
s_waitFrames=FRAMES_TO_WAIT; s_waitFrames=FRAMES_TO_WAIT;
CPadVibrationManager::stopAllVibration();
} }

View file

@ -17,6 +17,7 @@
-------- */ -------- */
#include "pad\vibe.h" #include "pad\vibe.h"
#include "pad\pads.h"
#ifndef __UTILS_HEADER__ #ifndef __UTILS_HEADER__
#include "utils\utils.h" #include "utils\utils.h"
@ -186,6 +187,7 @@ void CPadVibrationManager::stopAllVibration()
} }
s_currentIntensityValues[i]=0; s_currentIntensityValues[i]=0;
} }
PadUpdate(); // Ensure that pads ARE stopped
} }
/*=========================================================================== /*===========================================================================