diff --git a/Source/Project64/Project64.vcxproj b/Source/Project64/Project64.vcxproj
index 35b5a178c..c78b2bd17 100644
--- a/Source/Project64/Project64.vcxproj
+++ b/Source/Project64/Project64.vcxproj
@@ -65,37 +65,37 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Create
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -122,32 +122,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -155,6 +132,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Source/Project64/Project64.vcxproj.filters b/Source/Project64/Project64.vcxproj.filters
index b4af2e5e2..d90850483 100644
--- a/Source/Project64/Project64.vcxproj.filters
+++ b/Source/Project64/Project64.vcxproj.filters
@@ -46,15 +46,12 @@
{5531af4d-33bb-4e84-8a55-c971a18ec7bf}
-
- {6cfab019-2f8d-4e09-be41-1df513b5a680}
-
-
- {c4249d55-df70-4453-b017-b548514ad094}
-
{8eaf5c00-c88d-418e-a27c-d658c547ab79}
+
+ {c4249d55-df70-4453-b017-b548514ad094}
+
@@ -132,21 +129,6 @@
Source Files\User Interface Source
-
- Source Files\User Interface Source\Debugger Source
-
-
- Source Files\User Interface Source\Debugger Source
-
-
- Source Files\User Interface Source\Debugger Source
-
-
- Source Files\User Interface Source\Debugger Source
-
-
- Source Files\User Interface Source\Debugger Source
-
Source Files\Settings Files
@@ -168,52 +150,67 @@
Source Files
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
Source Files\User Interface Source\Debugger Source
-
+
+ Source Files\User Interface Source\Debugger Source
+
+
+ Source Files\User Interface Source\Debugger Source
+
+
+ Source Files\User Interface Source\Debugger Source
+
+
+ Source Files\User Interface Source\Debugger Source
+
+
+ Source Files\User Interface Source\Debugger Source
+
+
Source Files\User Interface Source\Debugger Source
@@ -224,27 +221,6 @@
Header Files\Multilanguage Headers
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
Header Files\User Interface Headers
@@ -353,60 +329,87 @@
Header Files
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
-
- Header Files\N64 System Headers\Debugger Headers
-
Header Files
Header Files\User Interface Headers\WTL Controls Headers
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
+
+ Header Files\User Interface Headers\Debugger Headers
+
diff --git a/Source/Project64/UserInterface/Debugger/DebugDialog.h b/Source/Project64/UserInterface/Debugger/DebugDialog.h
index 70413dc31..9a5330b5a 100644
--- a/Source/Project64/UserInterface/Debugger/DebugDialog.h
+++ b/Source/Project64/UserInterface/Debugger/DebugDialog.h
@@ -1,3 +1,5 @@
+#pragma once
+
template
class CDebugDialog :
public CDialogImpl < T >
diff --git a/Source/Project64/UserInterface/Debugger/stdafx.h b/Source/Project64/UserInterface/Debugger/stdafx.h
deleted file mode 100644
index 8b696d0b1..000000000
--- a/Source/Project64/UserInterface/Debugger/stdafx.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../stdafx.h"
diff --git a/Source/Project64/UserInterface/GuiClass.h b/Source/Project64/UserInterface/GuiClass.h
index e9e3d4cb5..48d00af0f 100644
--- a/Source/Project64/UserInterface/GuiClass.h
+++ b/Source/Project64/UserInterface/GuiClass.h
@@ -11,7 +11,7 @@
#pragma once
#include "../Settings/GuiSettings.h"
-#include
+#include
#include
class CGfxPlugin; //Plugin that controls the rendering
diff --git a/Source/Project64/UserInterface/MainMenuClass.cpp b/Source/Project64/UserInterface/MainMenuClass.cpp
index 65f8d3759..7bbc57291 100644
--- a/Source/Project64/UserInterface/MainMenuClass.cpp
+++ b/Source/Project64/UserInterface/MainMenuClass.cpp
@@ -1,10 +1,9 @@
#include "stdafx.h"
#include "RomInformationClass.h"
+#include "Debugger/Breakpoints.h"
+#include "Debugger/ScriptSystem.h"
#include
-#include
-#include
-
#include
#include
@@ -54,7 +53,7 @@ CMainMenu::CMainMenu(CMainGui * hMainWindow) :
m_ChangeSettingList.push_back(Debugger_AppLogFlush);
m_ChangeSettingList.push_back(Game_CurrentSaveState);
m_ChangeSettingList.push_back(Setting_CurrentLanguage);
-
+
for (UISettingList::const_iterator iter = m_ChangeUISettingList.begin(); iter != m_ChangeUISettingList.end(); iter++)
{
g_Settings->RegisterChangeCB((SettingID)(FirstUISettings + *iter), this, (CSettings::SettingChangedFunc)SettingsChanged);
@@ -507,13 +506,13 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
case ID_DEBUGGER_INTERRUPT_VI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_VI); break;
case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break;
case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break;
- case ID_DEBUGGER_BREAKPOINTS: m_Gui->Debug_ShowCommandsWindow(); break;
- case ID_DEBUGGER_SCRIPTS: m_Gui->Debug_ShowScriptsWindow(); break;
- case ID_DEBUGGER_SYMBOLS: m_Gui->Debug_ShowSymbolsWindow(); break;
- case ID_DEBUGGER_DMALOG: m_Gui->Debug_ShowDMALogWindow(); break;
- case ID_DEBUGGER_STACKTRACE: m_Gui->Debug_ShowStackTrace(); break;
- case ID_DEBUGGER_STACKVIEW: m_Gui->Debug_ShowStackWindow(); break;
- case ID_CURRENT_SAVE_DEFAULT:
+ case ID_DEBUGGER_BREAKPOINTS: m_Gui->Debug_ShowCommandsWindow(); break;
+ case ID_DEBUGGER_SCRIPTS: m_Gui->Debug_ShowScriptsWindow(); break;
+ case ID_DEBUGGER_SYMBOLS: m_Gui->Debug_ShowSymbolsWindow(); break;
+ case ID_DEBUGGER_DMALOG: m_Gui->Debug_ShowDMALogWindow(); break;
+ case ID_DEBUGGER_STACKTRACE: m_Gui->Debug_ShowStackTrace(); break;
+ case ID_DEBUGGER_STACKVIEW: m_Gui->Debug_ShowStackWindow(); break;
+ case ID_CURRENT_SAVE_DEFAULT:
g_Notify->DisplayMessage(3, stdstr_f(GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).c_str());
g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT));
break;
@@ -1004,10 +1003,10 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
/* Debug - R4300i
*******************/
-
- //ID_DEBUGGER_LOGOPTIONS
+
+ //ID_DEBUGGER_LOGOPTIONS
Item.Reset(ID_DEBUGGER_BREAKPOINTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"R4300i &Commands...");
- Item.SetItemEnabled(CPURunning);
+ Item.SetItemEnabled(CPURunning);
DebugR4300Menu.push_back(Item);
//Item.Reset(ID_DEBUGGER_R4300REGISTERS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"R4300i &Registers...");
@@ -1127,36 +1126,36 @@ void CMainMenu::FillOutMenu(HMENU hMenu)
Item.Reset(ID_DEBUGGER_BREAKPOINTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Breakpoint...");
//Item.SetItemEnabled(CPURunning);
DebugMenu.push_back(Item);
-
- /* Debugger - Symbols
- ****************/
- Item.Reset(ID_DEBUGGER_SYMBOLS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Symbols...");
- //Item.SetItemEnabled(CPURunning);
- DebugMenu.push_back(Item);
- /* Debug - Scripts
- *******************/
- Item.Reset(ID_DEBUGGER_SCRIPTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Scripts...");
- //Item.SetItemEnabled(CPURunning);
- DebugMenu.push_back(Item);
-
- /* Debug - DMA Log
- *******************/
- Item.Reset(ID_DEBUGGER_DMALOG, EMPTY_STRING, EMPTY_STDSTR, NULL, L"DMA Log...");
- //Item.SetItemEnabled(CPURunning);
- DebugMenu.push_back(Item);
+ /* Debugger - Symbols
+ ****************/
+ Item.Reset(ID_DEBUGGER_SYMBOLS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Symbols...");
+ //Item.SetItemEnabled(CPURunning);
+ DebugMenu.push_back(Item);
- /* Debug - Stack
- *******************/
- Item.Reset(ID_DEBUGGER_STACKVIEW, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack...");
- DebugMenu.push_back(Item);
+ /* Debug - Scripts
+ *******************/
+ Item.Reset(ID_DEBUGGER_SCRIPTS, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Scripts...");
+ //Item.SetItemEnabled(CPURunning);
+ DebugMenu.push_back(Item);
- /* Debug - Stack Trace
- *******************/
- Item.Reset(ID_DEBUGGER_STACKTRACE, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack Trace...");
- DebugMenu.push_back(Item);
+ /* Debug - DMA Log
+ *******************/
+ Item.Reset(ID_DEBUGGER_DMALOG, EMPTY_STRING, EMPTY_STDSTR, NULL, L"DMA Log...");
+ //Item.SetItemEnabled(CPURunning);
+ DebugMenu.push_back(Item);
- DebugMenu.push_back(MENU_ITEM(SPLITER));
+ /* Debug - Stack
+ *******************/
+ Item.Reset(ID_DEBUGGER_STACKVIEW, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack...");
+ DebugMenu.push_back(Item);
+
+ /* Debug - Stack Trace
+ *******************/
+ Item.Reset(ID_DEBUGGER_STACKTRACE, EMPTY_STRING, EMPTY_STDSTR, NULL, L"Stack Trace...");
+ DebugMenu.push_back(Item);
+
+ DebugMenu.push_back(MENU_ITEM(SPLITER));
/* Debug - RSP
*******************/
@@ -1344,4 +1343,4 @@ void CMainMenu::ResetMenu(void)
ResetAccelerators();
WriteTrace(TraceUserInterface, TraceDebug, "Done");
-}
+}
\ No newline at end of file