Revert "Son of Ugly's Wipeout patch"

Breaks Chrono Cross intro sequence camera. This reverts commit f7f38c4.
EwoutH · Mar 31, 2016 · 3c0cd06 · 3c0cd06
1 parent 0c06f5e
commit 3c0cd06
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 46 deletions.
diff --git a/data/pcsxr.ui b/data/pcsxr.ui
@@ -4150,23 +4150,6 @@
                         <property name="y_options"/>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkCheckButton" id="GtkCheckButton_MemHack">
-                        <property name="label" translatable="yes">Wipeout memory hack (causes slowdowns in many games)</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">14</property>
-                        <property name="bottom_attach">15</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"/>
-                      </packing>
-                    </child>
                   </object>
                 </child>
                 <child type="label">

diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c
@@ -945,7 +945,7 @@ void OnCpu_Clicked(GtkDialog *dialog, gint arg1, gpointer user_data) {
 	Config.NoMemcard = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_NoMemcard")));
 	Config.Widescreen = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")));
 	Config.HackFix = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix")));
-        Config.MemHack = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_MemHack")));
+
 	SaveConfig();
 
 	gtk_widget_destroy(CpuDlg);
@@ -1027,7 +1027,6 @@ void OnConf_Cpu() {
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_NoMemcard")), Config.NoMemcard);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_Widescreen")), Config.Widescreen);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_HackFix")), Config.HackFix);
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "GtkCheckButton_MemHack")), Config.MemHack);
 
 	// Setup a handler for when Close or Cancel is clicked
 	g_signal_connect_data(G_OBJECT(CpuDlg), "response",

diff --git a/gui/Config.c b/gui/Config.c
@@ -156,7 +156,6 @@ int LoadConfig(PcsxConfig *Conf) {
 		Config.AltSpeed2 = 250;
 
 	Config.HackFix = GetValuel(data, "HackFix");
-        Config.MemHack = GetValuel(data, "MemHack");
 
 	free(data);
 
@@ -211,7 +210,6 @@ void SaveConfig() {
 	SetValuel("AltSpeed2", Config.AltSpeed2);
 
 	SetValuel("HackFix", Config.HackFix);
-        SetValuel("MemHack", Config.MemHack);
 
 	fclose(f);
 }
diff --git a/libpcsxcore/psxcommon.h b/libpcsxcore/psxcommon.h
@@ -162,7 +162,6 @@ typedef struct {
 	u32 AltSpeed1; // Percent relative to natural speed.
 	u32 AltSpeed2;
 	u8 HackFix;
-	u8 MemHack;
 #ifdef _WIN32
 	char Lang[256];
 #endif

diff --git a/libpcsxcore/psxmem.c b/libpcsxcore/psxmem.c
@@ -143,10 +143,9 @@ u8 psxMemRead8(u32 mem) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 0;
-	}
+
+	psxRegs.cycle += 0;
+
 
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
@@ -173,11 +172,10 @@ u16 psxMemRead16(u32 mem) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 1;
-	}
 
+	psxRegs.cycle += 1;
+
+
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -203,11 +201,10 @@ u32 psxMemRead32(u32 mem) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 1;
-	}
 
+	psxRegs.cycle += 1;
+
+
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -233,11 +230,10 @@ void psxMemWrite8(u32 mem, u8 value) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 1;
-	}
 
+	psxRegs.cycle += 1;
+
+
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -265,11 +261,10 @@ void psxMemWrite16(u32 mem, u16 value) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 1;
-	}
 
+	psxRegs.cycle += 1;
+
+
 	t = mem >> 16;
 	if (t == 0x1f80 || t == 0x9f80 || t == 0xbf80) {
 		if ((mem & 0xffff) < 0x400)
@@ -297,10 +292,9 @@ void psxMemWrite32(u32 mem, u32 value) {
 	char *p;
 	u32 t;
 
-	if (Config.MemHack)
-	{
-		psxRegs.cycle += 1;
-	}
+
+	psxRegs.cycle += 1;
+
 
 	//	if ((mem&0x1fffff) == 0x71E18 || value == 0x48088800) SysPrintf("t2fix!!\n");
 	t = mem >> 16;