summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorShawn Hoffman <godisgovernment@gmail.com>2011-10-03 22:54:15 -0700
committerShawn Hoffman <godisgovernment@gmail.com>2011-10-03 23:46:00 -0700
commit856972f808e62b026f1c4bc035e95722c86fac92 (patch)
tree91d5009ddb9176eb59fed7a6d2f72df8ce6788cb /Source/Core
parentd8def74dd1cda90af4fc523cc836ca3e36bb2126 (diff)
remove hacky old MicButton stuff
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/Src/HW/SI_DeviceGCController.cpp2
-rw-r--r--Source/Core/Core/Src/Movie.cpp2
-rw-r--r--Source/Core/InputCommon/Src/GCPadStatus.h1
3 files changed, 0 insertions, 5 deletions
diff --git a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
index f4ee12d9dc..601fb98f02 100644
--- a/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
+++ b/Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
@@ -239,8 +239,6 @@ bool CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
}
}
- SetMic(PadStatus.MicButton); // This is dumb and should not be here
-
return true;
}
diff --git a/Source/Core/Core/Src/Movie.cpp b/Source/Core/Core/Src/Movie.cpp
index 5bfd5fbc24..d340496c33 100644
--- a/Source/Core/Core/Src/Movie.cpp
+++ b/Source/Core/Core/Src/Movie.cpp
@@ -483,10 +483,8 @@ void PlayController(SPADStatus *PadStatus, int controllerID)
// dtm files don't save the mic button or error bit. not sure if they're actually
// used, but better safe than sorry
- bool m = PadStatus->MicButton;
signed char e = PadStatus->err;
memset(PadStatus, 0, sizeof(SPADStatus));
- PadStatus->MicButton = m;
PadStatus->err = e;
memcpy(&g_padState, &(tmpInput[inputOffset]), 8);
diff --git a/Source/Core/InputCommon/Src/GCPadStatus.h b/Source/Core/InputCommon/Src/GCPadStatus.h
index 72b790bbc6..835089a70d 100644
--- a/Source/Core/InputCommon/Src/GCPadStatus.h
+++ b/Source/Core/InputCommon/Src/GCPadStatus.h
@@ -51,7 +51,6 @@ typedef struct
unsigned char triggerRight; // 0 <= triggerRight <= 255
unsigned char analogA; // 0 <= analogA <= 255
unsigned char analogB; // 0 <= analogB <= 255
- bool MicButton; // HAX
signed char err; // one of PAD_ERR_* number
} SPADStatus;