diff options
| author | flacs <tilkax@gmail.com> | 2015-07-09 16:35:58 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-07-09 16:35:58 +0200 |
| commit | 95fed00cbbcfc881380cee323c65af1993312f43 (patch) | |
| tree | 96639e599fbeb78b542d3c48e57cb4e933c57f58 /Source/Core/DolphinWX/Debugger/MemoryView.cpp | |
| parent | 7d41b8ae9cbaa7787499dcc3842682a1b71db538 (diff) | |
| parent | 81878d7b5641f28338fac62b24d43d9bff3f502e (diff) | |
Merge pull request #2729 from lioncash/magic
DolphinWX: Get rid of some magic numbers in MemoryView and MemoryWindow
Diffstat (limited to 'Source/Core/DolphinWX/Debugger/MemoryView.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Debugger/MemoryView.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp index b5ecfa339b..812c1a8eda 100644 --- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp +++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp @@ -43,7 +43,6 @@ enum CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent) : wxControl(parent, wxID_ANY) - , curAddress(debuginterface->GetPC()) , debugger(debuginterface) , align(debuginterface->GetInstructionSize(0)) , rowHeight(13) @@ -51,6 +50,8 @@ CMemoryView::CMemoryView(DebugInterface* debuginterface, wxWindow* parent) , oldSelection(0) , selecting(false) , memory(0) + , curAddress(debuginterface->GetPC()) + , dataType(MemoryDataType::U8) , viewAsType(VIEWAS_FP) { Bind(wxEVT_PAINT, &CMemoryView::OnPaint, this); @@ -364,21 +365,21 @@ void CMemoryView::OnPaint(wxPaintEvent& event) { switch (dataType) { - case 0: + case MemoryDataType::U8: dis += StringFromFormat(" %02X %02X %02X %02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, ((word & 0xff00) >> 8) & 0xFF, word & 0xff); break; - case 1: + case MemoryDataType::U16: dis += StringFromFormat(" %02X%02X %02X%02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, ((word & 0xff00) >> 8) & 0xFF, word & 0xff); break; - case 2: + case MemoryDataType::U32: dis += StringFromFormat(" %02X%02X%02X%02X", ((word & 0xff000000) >> 24) & 0xFF, ((word & 0xff0000) >> 16) & 0xFF, |