From db91ce2d9995166381d78b8eae526a1892d9edf7 Mon Sep 17 00:00:00 2001
From: Daveo <daveo@localhost>
Date: Tue, 14 Aug 2001 12:57:28 +0000
Subject: [PATCH]

---
 source/gfx/fader.cpp | 3 +++
 source/pad/vibe.cpp  | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/source/gfx/fader.cpp b/source/gfx/fader.cpp
index f3e55f179..4907e710f 100644
--- a/source/gfx/fader.cpp
+++ b/source/gfx/fader.cpp
@@ -31,6 +31,7 @@
 #endif
 
 #include	"system\vid.h"
+#include	"pad\vibe.h"
 
 /*	Std Lib
 	------- */
@@ -237,6 +238,7 @@ void CFader::setFadingOut(FADE_STYLE _style)
 	s_fadeMode=FADING_OUT;
 	s_fadeStyle=_style;
 	s_waitFrames=FRAMES_TO_WAIT;
+	CPadVibrationManager::stopAllVibration();
 }
 
 
@@ -258,6 +260,7 @@ void CFader::setFadingIn(FADE_STYLE _style)
 	s_fadeStyle=_style;
 	s_fadeMode=PAUSE_BEFORE_FADING_IN;
 	s_waitFrames=FRAMES_TO_WAIT;
+	CPadVibrationManager::stopAllVibration();
 }
 
 
diff --git a/source/pad/vibe.cpp b/source/pad/vibe.cpp
index 52677e621..a984c0d94 100644
--- a/source/pad/vibe.cpp
+++ b/source/pad/vibe.cpp
@@ -17,6 +17,7 @@
 	-------- */
 
 #include "pad\vibe.h"
+#include "pad\pads.h"
 
 #ifndef	__UTILS_HEADER__
 #include "utils\utils.h"
@@ -186,6 +187,7 @@ void	CPadVibrationManager::stopAllVibration()
 		}
 		s_currentIntensityValues[i]=0;
 	}
+	PadUpdate();	// Ensure that pads ARE stopped
 }
 
 /*===========================================================================