Conflicted with my own commit. Repaired conflicted files, and made sure about the code removal I intended as well.

src/drivers/win/cheat.cpp

@@ -147,34 +147,6 @@ void EnableCheatButtons(HWND hwndDlg, int enable) {
 	EnableWindow(GetDlgItem(hwndDlg,IDC_BTN_CHEAT_LT),enable);
 }
 
-void CheatDialogSearchEQ() {
-	searchdone=1;
-	FCEUI_CheatSearchEnd(2,0,0);
-	ShowResults(hCheat);
-	return;
-}
-
-void CheatDialogSearchNE() {
-	searchdone=1;
-	FCEUI_CheatSearchEnd(3,0,0);
-	ShowResults(hCheat);
-	return;
-}
-
-void CheatDialogSearchGT() {
-	searchdone=1;
-	FCEUI_CheatSearchEnd(5,0,0);
-	ShowResults(hCheat);
-	return;
-}
-
-void CheatDialogSearchLT() {
-	searchdone=1;
-	FCEUI_CheatSearchEnd(6,0,0);
-	ShowResults(hCheat);
-	return;
-}
-
 BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) {
 	LOGFONT lf;
 	RECT wrect;
@@ -496,37 +468,36 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
 							ShowResults(hwndDlg);
 							break;
 						case IDC_BTN_CHEAT_EQ:
-							CheatDialogSearchEQ();
+							searchdone=1;
-							//searchdone=1;
+							FCEUI_CheatSearchEnd(2,0,0);
-							//FCEUI_CheatSearchEnd(2,0,0);
+							ShowResults(hwndDlg);
-							//ShowResults(hwndDlg);
 							break;
 						case IDC_BTN_CHEAT_NE:
+							searchdone=1;
 							if (IsDlgButtonChecked(hwndDlg,IDC_CHEAT_CHECK_NE_BY) == BST_CHECKED) {
-								searchdone=1;
 								GetDlgItemText(hwndDlg,IDC_CHEAT_VAL_NE_BY,str,3);
 								FCEUI_CheatSearchEnd(2,0,StrToU8(str));
-								ShowResults(hwndDlg);
 							}
-							else CheatDialogSearchNE(); //FCEUI_CheatSearchEnd(3,0,0);
+							else FCEUI_CheatSearchEnd(3,0,0);
+							ShowResults(hwndDlg);
 							break;
 						case IDC_BTN_CHEAT_GT:
+							searchdone=1;
 							if (IsDlgButtonChecked(hwndDlg,IDC_CHEAT_CHECK_GT_BY) == BST_CHECKED) {
-								searchdone=1;
 								GetDlgItemText(hwndDlg,IDC_CHEAT_VAL_GT_BY,str,3);
 								FCEUI_CheatSearchEnd(7,0,StrToU8(str));
-								ShowResults(hwndDlg);
 							}
-							else CheatDialogSearchGT();
+							else FCEUI_CheatSearchEnd(5,0,0);
+							ShowResults(hwndDlg);
 							break;
 						case IDC_BTN_CHEAT_LT:
+							searchdone=1;
 							if (IsDlgButtonChecked(hwndDlg,IDC_CHEAT_CHECK_LT_BY) == BST_CHECKED) {
-								searchdone=1;
 								GetDlgItemText(hwndDlg,IDC_CHEAT_VAL_LT_BY,str,3);
 								FCEUI_CheatSearchEnd(8,0,StrToU8(str));
-								ShowResults(hwndDlg);
 							}
-							else CheatDialogSearchLT();
+							else FCEUI_CheatSearchEnd(6,0,0);
+							ShowResults(hwndDlg);
 							break;
 					}
 					break;

src/drivers/win/cheat.h

@@ -10,10 +10,6 @@ void DoGGConv();
 void SetGGConvFocus(int address,int compare);
 void UpdateCheatList();
 void UpdateCheatsAdded();
-void CheatDialogSearchEQ();
-void CheatDialogSearchNE();
-void CheatDialogSearchGT();
-void CheatDialogSearchLT();
 
 extern unsigned int FrozenAddressCount;
 extern std::vector<uint16> FrozenAddresses;

src/input.cpp

@@ -632,19 +632,12 @@ static void LaunchTraceLogger(void);
 static void LaunchCodeDataLogger(void);
 static void LaunchRamWatch(void);
 static void LaunchRamSearch(void);
-<<<<<<< .mine
 static void RamSearchOpLT(void);
 static void RamSearchOpGT(void);
 static void RamSearchOpLTE(void);
 static void RamSearchOpGTE(void);
 static void RamSearchOpEQ(void);
 static void RamSearchOpNE(void);
-=======
-static void CheatSearchEQ(void);
-static void CheatSearchNE(void);
-static void CheatSearchGT(void);
-static void CheatSearchLT(void);
->>>>>>> .r1856
 static void FA_SkipLag(void);
 static void OpenRom(void);
 static void CloseRom(void);
@@ -767,19 +760,12 @@ struct EMUCMDTABLE FCEUI_CommandTable[]=
 	{ EMUCMD_MISC_TOGGLEFULLSCREEN,			EMUCMDTYPE_MISC,	ToggleFullscreen, 0, 0, "Toggle Fullscreen",	  0},
 	{ EMUCMD_TOOL_OPENRAMWATCH,				EMUCMDTYPE_TOOL,	LaunchRamWatch,	  0, 0, "Open Ram Watch",		  0},
 	{ EMUCMD_TOOL_OPENRAMSEARCH,			EMUCMDTYPE_TOOL,	LaunchRamSearch,  0, 0, "Open Ram Search",		  0},
-<<<<<<< .mine
 	{ EMUCMD_TOOL_RAMSEARCHLT,				EMUCMDTYPE_TOOL,	RamSearchOpLT,	  0, 0, "Ram Search - Less Than", 0},
 	{ EMUCMD_TOOL_RAMSEARCHGT,				EMUCMDTYPE_TOOL,	RamSearchOpGT,	  0, 0, "Ram Search - Greater Than", 0},
 	{ EMUCMD_TOOL_RAMSEARCHLTE,				EMUCMDTYPE_TOOL,	RamSearchOpLTE,	  0, 0, "Ram Search - Less Than or Equal", 0},
 	{ EMUCMD_TOOL_RAMSEARCHGTE,				EMUCMDTYPE_TOOL,	RamSearchOpGTE,	  0, 0, "Ram Search - Greater Than or Equal", 0},
 	{ EMUCMD_TOOL_RAMSEARCHEQ,				EMUCMDTYPE_TOOL,	RamSearchOpEQ,	  0, 0, "Ram Search - Equal",	  0},
 	{ EMUCMD_TOOL_RAMSEARCHNE,				EMUCMDTYPE_TOOL,	RamSearchOpNE,	  0, 0, "Ram Search - Not Equal", 0},
-=======
-	{ EMUCMD_CHEAT_SEARCHEQ,				EMUCMDTYPE_TOOL,	CheatSearchEQ,	  0, 0, "Cheat Search Equal",		  0},
-	{ EMUCMD_CHEAT_SEARCHNE,				EMUCMDTYPE_TOOL,	CheatSearchNE,	  0, 0, "Cheat Search Not Equal",		  0},
-	{ EMUCMD_CHEAT_SEARCHGT,				EMUCMDTYPE_TOOL,	CheatSearchGT,	  0, 0, "Cheat Search Greater Than",		  0},
-	{ EMUCMD_CHEAT_SEARCHLT,				EMUCMDTYPE_TOOL,	CheatSearchLT,	  0, 0, "Cheat Search Less Than",		  0},
->>>>>>> .r1856
 };
 
 #define NUM_EMU_CMDS		(sizeof(FCEUI_CommandTable)/sizeof(FCEUI_CommandTable[0]))
@@ -980,7 +966,6 @@ static void LaunchRamSearch(void)
 #endif
 }
 
-<<<<<<< .mine
 static void RamSearchOpLT(void) {
 #ifdef WIN32
 	extern void SetSearchType(int SearchType);
@@ -989,17 +974,7 @@ static void RamSearchOpLT(void) {
 	DoRamSearchOperation();
 #endif
 }
-=======
-static void CheatSearchEQ(void)
-{
-#ifdef WIN32
-	extern void CheatDialogSearchEQ();
-	CheatDialogSearchEQ();
-#endif
-}
->>>>>>> .r1856
 
-<<<<<<< .mine
 static void RamSearchOpGT(void) {
 #ifdef WIN32
 	extern void SetSearchType(int SearchType);
@@ -1008,17 +983,7 @@ static void RamSearchOpGT(void) {
 	DoRamSearchOperation();
 #endif
 }
-=======
-static void CheatSearchNE(void)
-{
-#ifdef WIN32
-	extern void CheatDialogSearchNE();
-	CheatDialogSearchNE();
-#endif
-}
->>>>>>> .r1856
 
-<<<<<<< .mine
 static void RamSearchOpLTE(void) {
 #ifdef WIN32
 	extern void SetSearchType(int SearchType);
@@ -1055,26 +1020,6 @@ static void RamSearchOpNE(void) {
 #endif
 }
 
-=======
-static void CheatSearchGT(void)
-{
-#ifdef WIN32
-	extern void CheatDialogSearchGT();
-	CheatDialogSearchGT();
-#endif
-}
-
-static void CheatSearchLT(void)
-{
-#ifdef WIN32
-	extern void CheatDialogSearchLT();
-	CheatDialogSearchLT();
-#endif
-}
-
-
-
->>>>>>> .r1856
 static void FA_SkipLag(void)
 {
 	frameAdvanceLagSkip ^= 1;

src/input.h

@@ -275,4 +275,3 @@ extern bool turbo;
 void LagCounterReset();
 
 #endif //_INPUT_H_
-