Merge pull request #797 from raven02/master

Remove option DisableG3Dlog , shouldn't need it anymore

Core/Config.cpp

@@ -75,7 +75,6 @@ void CConfig::Load(const char *iniFileName)
 #else
 	graphics->Get("AnisotropyLevel", &iAnisotropyLevel, 8);
 #endif
-	graphics->Get("DisableG3DLog", &bDisableG3DLog, false);
 	graphics->Get("VertexCache", &bVertexCache, true);
 	graphics->Get("FullScreen", &bFullScreen, false);	
 	graphics->Get("StretchToDisplay", &bStretchToDisplay, false);
@@ -136,7 +135,6 @@ void CConfig::Save()
 		graphics->Set("VBO", bUseVBO);
 		graphics->Set("FrameSkip", iFrameSkip);
 		graphics->Set("AnisotropyLevel", iAnisotropyLevel);
-		graphics->Set("DisableG3DLog", bDisableG3DLog);
 		graphics->Set("VertexCache", bVertexCache);
 		graphics->Set("FullScreen", bFullScreen);
 		graphics->Set("StretchToDisplay", bStretchToDisplay);

Core/Config.h

@@ -63,7 +63,6 @@ public:
 
 	int iWindowZoom;  // for Windows
 	bool SSAntiAliasing; //for Windows, too
-	bool bDisableG3DLog;
 	bool bVertexCache;
 	bool bFullScreen;
 	int iAnisotropyLevel;

Windows/EmuThread.cpp

@@ -79,7 +79,6 @@ DWORD TheThread(LPVOID x)
 	coreParameter.pixelWidth = 480 * g_Config.iWindowZoom;
 	coreParameter.pixelHeight = 272 * g_Config.iWindowZoom;
 	coreParameter.startPaused = !g_Config.bAutoRun;
-	coreParameter.disableG3Dlog = g_Config.bDisableG3DLog;
 	coreParameter.useMediaEngine = false;
 
 	std::string error_string;

Windows/WndMainWindow.cpp

@@ -533,14 +533,6 @@ namespace MainWindow
 				UpdateMenus();
 				ResizeDisplay(true);
 				break;
-			case ID_OPTIONS_DISABLEG3DLOG:
-				g_Config.bDisableG3DLog = !g_Config.bDisableG3DLog;
-				if (!g_Config.bDisableG3DLog )
-					LogManager::GetInstance()->SetEnable(LogTypes::G3D, true);
-				else 
-					LogManager::GetInstance()->SetEnable(LogTypes::G3D, false);
-				UpdateMenus();
-				break;
 			case ID_OPTIONS_CONTROLS:
 				DialogManager::EnableAll(FALSE);
 				DialogBox(hInst, (LPCTSTR)IDD_CONTROLS, hWnd, (DLGPROC)Controls);
@@ -687,7 +679,6 @@ namespace MainWindow
 		CHECKITEM(ID_OPTIONS_STRETCHDISPLAY, g_Config.bStretchToDisplay);
 		CHECKITEM(ID_EMULATION_RUNONLOAD, g_Config.bAutoRun);
 		CHECKITEM(ID_OPTIONS_USEVBO, g_Config.bUseVBO);
-		CHECKITEM(ID_OPTIONS_DISABLEG3DLOG, g_Config.bDisableG3DLog);
 		CHECKITEM(ID_OPTIONS_VERTEXCACHE, g_Config.bVertexCache);
 		CHECKITEM(ID_OPTIONS_SHOWFPS, g_Config.bShowFPSCounter);
 		CHECKITEM(ID_OPTIONS_FRAMESKIP, g_Config.iFrameSkip != 0);