From c999dba9796cced863699436c8f858aa6019332c Mon Sep 17 00:00:00 2001 From: ansstuff Date: Tue, 2 Oct 2012 12:22:05 +0000 Subject: [PATCH] * Cheats: applied bugfix patch by rimsky82, updated the Cheats dialog * Debugger/Tracer: symbolic comments use the ";" prefix instead of "//" --- src/drivers/win/cheat.cpp | 2 +- src/drivers/win/debugger.cpp | 2 +- src/drivers/win/res.rc | 73 +++++++++++++++++------------------- src/drivers/win/tracer.cpp | 2 +- 4 files changed, 38 insertions(+), 41 deletions(-) diff --git a/src/drivers/win/cheat.cpp b/src/drivers/win/cheat.cpp index 7e903696..483e2c26 100644 --- a/src/drivers/win/cheat.cpp +++ b/src/drivers/win/cheat.cpp @@ -612,7 +612,7 @@ BOOL CALLBACK CheatConsoleCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l // FCEUI_GetCheat(selcheattemp,&name,&a,&v,&s); //bbit edited: replaced this with the line below FCEUI_GetCheat(selcheattemp,&name,&a,&v,&c,&s,NULL); // FCEUI_SetCheat(selcheattemp,0,-1,-1,s^=1);//bbit edited: replaced this with the line below - FCEUI_SetCheat(selcheattemp,0,-1,-1,-1,s^=1,1); + FCEUI_SetCheat(selcheattemp,0,-1,-1,-2,s^=1,1); strcpy(str,(s?"* ":" ")); if(name[0] == 0) { if(a >= 0x8000) EncodeGG(str+2, a, v, c); diff --git a/src/drivers/win/debugger.cpp b/src/drivers/win/debugger.cpp index 94aaf8c9..391323ff 100644 --- a/src/drivers/win/debugger.cpp +++ b/src/drivers/win/debugger.cpp @@ -414,7 +414,7 @@ void Disassemble(HWND hWnd, int id, int scrollid, unsigned int addr) while (end_pos) { end_pos[0] = 0; // set \0 instead of \r - strcat(debug_str, "// "); + strcat(debug_str, "; "); strcat(debug_str, debug_decoration_comment); strcat(debug_str, "\r\n"); end_pos += 2; diff --git a/src/drivers/win/res.rc b/src/drivers/win/res.rc index 94e3fdb4..bcb464ba 100644 --- a/src/drivers/win/res.rc +++ b/src/drivers/win/res.rc @@ -12,7 +12,7 @@ #undef APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// -// Neutral resources +// Нейтральный resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -1662,44 +1662,44 @@ BEGIN LTEXT "New Selection Name:",-1,5,240,68,8 END -CHEATCONSOLE DIALOGEX 0, 0, 384, 186 +CHEATCONSOLE DIALOGEX 0, 0, 379, 186 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_MINIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Cheat Search" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Active Cheats",201,1,1,133,168,WS_TABSTOP - GROUPBOX "Cheat Search",202,139,1,238,168,WS_TABSTOP - LISTBOX IDC_LIST_CHEATS,12,14,115,110,LBS_EXTENDEDSEL | WS_VSCROLL + GROUPBOX "Active Cheats",201,5,1,129,168,WS_TABSTOP + GROUPBOX "Cheat Search",202,139,1,234,168,WS_TABSTOP + LISTBOX IDC_LIST_CHEATS,11,11,118,102,LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | WS_VSCROLL LTEXT "Name:",IDC_STATIC,12,118,22,10 - LTEXT "A:",IDC_STATIC,12,134,8,10 - LTEXT "V:",IDC_STATIC,59,134,8,10 - LTEXT "C:",IDC_STATIC,96,134,8,10 - EDITTEXT IDC_CHEAT_NAME,35,116,92,12,ES_AUTOHSCROLL | ES_WANTRETURN - EDITTEXT IDC_CHEAT_ADDR,21,132,32,12,ES_UPPERCASE | ES_WANTRETURN - EDITTEXT IDC_CHEAT_VAL,70,132,20,12,ES_UPPERCASE | ES_WANTRETURN - EDITTEXT IDC_CHEAT_COM,107,132,20,12,ES_UPPERCASE | ES_WANTRETURN - DEFPUSHBUTTON "Add",IDC_BTN_CHEAT_ADD,12,148,35,16 - PUSHBUTTON "Delete",IDC_BTN_CHEAT_DEL,52,148,35,16 - PUSHBUTTON "Update",IDC_BTN_CHEAT_UPD,92,148,35,16 + LTEXT "Addr:",IDC_STATIC,12,134,18,10 + LTEXT "Val:",IDC_STATIC,61,134,12,10 + LTEXT "Cmp:",IDC_STATIC,95,134,16,10 + EDITTEXT IDC_CHEAT_NAME,35,116,94,12,ES_AUTOHSCROLL | ES_WANTRETURN + EDITTEXT IDC_CHEAT_ADDR,31,132,25,12,ES_UPPERCASE | ES_WANTRETURN + EDITTEXT IDC_CHEAT_VAL,74,132,16,12,ES_UPPERCASE | ES_WANTRETURN + EDITTEXT IDC_CHEAT_COM,113,132,16,12,ES_UPPERCASE | ES_WANTRETURN + DEFPUSHBUTTON "Add",IDC_BTN_CHEAT_ADD,11,148,36,16 + PUSHBUTTON "Delete",IDC_BTN_CHEAT_DEL,52,148,36,16 + PUSHBUTTON "Update",IDC_BTN_CHEAT_UPD,93,148,36,16 PUSHBUTTON "Reset",IDC_BTN_CHEAT_RESET,146,12,55,15 PUSHBUTTON "Known Value:",IDC_BTN_CHEAT_KNOWN,146,31,55,15 - LTEXT "0x",IDC_STATIC,204,34,9,8 - EDITTEXT IDC_CHEAT_VAL_KNOWN,213,32,20,12,ES_UPPERCASE - GROUPBOX "Previous Compare",204,139,51,114,118 - PUSHBUTTON "Equal",IDC_BTN_CHEAT_EQ,146,64,55,15,WS_GROUP - PUSHBUTTON "Not Equal",IDC_BTN_CHEAT_NE,146,91,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_NE_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,94,22,10 - EDITTEXT IDC_CHEAT_VAL_NE_BY,228,93,20,12,ES_UPPERCASE | ES_WANTRETURN - PUSHBUTTON "Greater Than",IDC_BTN_CHEAT_GT,146,118,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_GT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,121,22,10 - EDITTEXT IDC_CHEAT_VAL_GT_BY,228,120,20,12,ES_UPPERCASE | ES_WANTRETURN - PUSHBUTTON "Less Than",IDC_BTN_CHEAT_LT,146,145,55,15 - CONTROL "By:",IDC_CHEAT_CHECK_LT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,148,22,10 - EDITTEXT IDC_CHEAT_VAL_LT_BY,228,147,20,12,ES_UPPERCASE | ES_WANTRETURN - GROUPBOX "Possibilities",IDC_CHEAT_BOX_POSSIBILITIES,252,13,125,156,WS_TABSTOP - LISTBOX IDC_CHEAT_LIST_POSSIBILITIES,260,25,99,147,LBS_SORT | LBS_WANTKEYBOARDINPUT | WS_TABSTOP - SCROLLBAR IDC_CHEAT_SCRL_POSSIBILITIES,360,25,10,138,SBS_VERT - CONTROL "Pause when active",IDC_CHEAT_PAUSEWHENACTIVE,"Button",BS_AUTOCHECKBOX,7,173,76,10 + LTEXT "0x",IDC_STATIC,205,34,9,8 + EDITTEXT IDC_CHEAT_VAL_KNOWN,215,32,18,12,ES_UPPERCASE + GROUPBOX "Previous Compare",204,145,49,113,115 + PUSHBUTTON "Equal",IDC_BTN_CHEAT_EQ,151,62,55,15,WS_GROUP + PUSHBUTTON "Not Equal",IDC_BTN_CHEAT_NE,151,87,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_NE_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,90,22,10 + EDITTEXT IDC_CHEAT_VAL_NE_BY,234,89,18,12,ES_UPPERCASE | ES_WANTRETURN + PUSHBUTTON "Greater Than",IDC_BTN_CHEAT_GT,151,114,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_GT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,117,22,10 + EDITTEXT IDC_CHEAT_VAL_GT_BY,234,116,18,12,ES_UPPERCASE | ES_WANTRETURN + PUSHBUTTON "Less Than",IDC_BTN_CHEAT_LT,151,141,55,15 + CONTROL "By:",IDC_CHEAT_CHECK_LT_BY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,210,144,22,10 + EDITTEXT IDC_CHEAT_VAL_LT_BY,234,143,18,12,ES_UPPERCASE | ES_WANTRETURN + GROUPBOX "Possibilities",IDC_CHEAT_BOX_POSSIBILITIES,263,8,105,156,WS_TABSTOP + LISTBOX IDC_CHEAT_LIST_POSSIBILITIES,268,18,85,142,LBS_SORT | LBS_NOINTEGRALHEIGHT | LBS_WANTKEYBOARDINPUT | WS_TABSTOP + SCROLLBAR IDC_CHEAT_SCRL_POSSIBILITIES,354,18,10,142,SBS_VERT + CONTROL "Pause when active",IDC_CHEAT_PAUSEWHENACTIVE,"Button",BS_AUTOCHECKBOX,10,172,76,10 END IDD_LUA DIALOGEX 0, 0, 270, 150 @@ -2106,10 +2106,7 @@ BEGIN "CHEATCONSOLE", DIALOG BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 377 TOPMARGIN, 7 - BOTTOMMARGIN, 183 END IDD_LUA, DIALOG @@ -2126,12 +2123,12 @@ BEGIN END #endif // APSTUDIO_INVOKED -#endif // Neutral resources +#endif // Нейтральный resources ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// -// English (United States) resources +// Английский (США) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US @@ -2365,7 +2362,7 @@ IDB_BITMAP_SELECTED17 BITMAP "res\\te_17_selected.bmp" IDB_BITMAP_SELECTED18 BITMAP "res\\te_18_selected.bmp" IDB_BITMAP_SELECTED19 BITMAP "res\\te_19_selected.bmp" IDB_BRANCH_SPRITESHEET BITMAP "res\\branch_spritesheet.bmp" -#endif // English (United States) resources +#endif // Английский (США) resources ///////////////////////////////////////////////////////////////////////////// diff --git a/src/drivers/win/tracer.cpp b/src/drivers/win/tracer.cpp index a43ca1a7..e9979ba2 100644 --- a/src/drivers/win/tracer.cpp +++ b/src/drivers/win/tracer.cpp @@ -435,7 +435,7 @@ void FCEUD_TraceInstruction(uint8 *opcode, int size) while (end_pos) { end_pos[0] = 0; // set \0 instead of \r - strcpy(str_decoration, "// "); + strcpy(str_decoration, "; "); strcat(str_decoration, tracer_decoration_comment); OutputLogLine(str_decoration, true); end_pos += 2;