diff --git a/desmume/src/windows/ramwatch.cpp b/desmume/src/windows/ramwatch.cpp index c185e894c..17a96f290 100644 --- a/desmume/src/windows/ramwatch.cpp +++ b/desmume/src/windows/ramwatch.cpp @@ -683,6 +683,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case 'h': SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0); break; + case 'f': + SendDlgItemMessage(hDlg, IDC_2012, BM_SETCHECK, BST_CHECKED, 0); + break; default: t = 0; break; @@ -703,6 +706,9 @@ LRESULT CALLBACK EditWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPara case IDC_HEX: t='h'; return true; + case IDC_2012: + t='f'; + return true; case IDC_1_BYTE: s = 'b'; return true; @@ -967,13 +973,18 @@ LRESULT CALLBACK RamWatchProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam int t = rswatches[iNum].Type; int size = rswatches[iNum].Size; const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X")); - switch (size) + if(t=='f') { - case 'b': - default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break; - case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break; - case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break; + sprintf(num,"%f",i/4096.0f); } + else + switch (size) + { + case 'b': + default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break; + case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break; + case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break; + } Item->item.pszText = num; } return true; diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index 455ba8fa0..a16a307f0 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -248,6 +248,7 @@ #define IDC_2_BYTES 958 #define IDC_4_BYTES 959 #define IDC_WATCHLIST 960 +#define IDC_HEX2 960 #define IDC_C_WATCH_EDIT 961 #define IDC_C_WATCH_REMOVE 962 #define IDC_C_WATCH 963 @@ -386,7 +387,6 @@ #define IDC_RFILE 1038 #define IDC_EXPORT 1038 #define IDC_RFOLDER 1039 -#define IDC_STATIC2 1039 #define IDC_2012 1039 #define IDC_BBROWSE2 1040 #define IDC_PATHDESMUME 1041 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index c7e3ba25c..7c3b7370a 100644 Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ