X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fpreferences.cpp;h=b3d176ba21a89d814e3c28cad4685e51bdcd22b5;hb=d079351041fe957ab2cf6b36dab38e5546003dc3;hp=4209fdb35d6c5196fc1cae7e0c1909b2663d414b;hpb=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git

diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 4209fdb3..b3d176ba 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -1,4 +1,4 @@
-/*
+/*
    Copyright (C) 1999-2006 Id Software, Inc. and contributors.
    For a list of contributors, see the accompanying CONTRIBUTORS file.
 
@@ -71,7 +71,7 @@ void Global_constructPreferences( PreferencesPage& page ){
 
 void Interface_constructPreferences( PreferencesPage& page ){
 #ifdef WIN32
-	page.appendCheckBox( "", "Default Text Editor", g_TextEditor_useWin32Editor );
+	page.appendCheckBox( "", "External Shader Editor", g_TextEditor_useWin32Editor );
 #else
 	{
 		GtkWidget* use_custom = page.appendCheckBox( "Text Editor", "Custom", g_TextEditor_useCustomEditor );
@@ -82,11 +82,12 @@ void Interface_constructPreferences( PreferencesPage& page ){
 }
 
 void Mouse_constructPreferences( PreferencesPage& page ){
-	{
-		const char* buttons[] = { "2 button", "3 button", };
-		page.appendRadio( "Mouse Type",  g_glwindow_globals.m_nMouseType, STRING_ARRAY_RANGE( buttons ) );
-	}
-	page.appendCheckBox( "Right Button", "Activates Context Menu", g_xywindow_globals.m_bRightClick );
+//	{
+//		const char* buttons[] = { "2 button", "3 button", };
+//		page.appendRadio( "Mouse Type",  g_glwindow_globals.m_nMouseType, STRING_ARRAY_RANGE( buttons ) );
+//	}
+//	page.appendCheckBox( "Right Button", "Activates Context Menu", g_xywindow_globals.m_bRightClick );
+	page.appendCheckBox( "", "Improved mousewheel zoom", g_xywindow_globals.m_bImprovedWheelZoom );
 }
 void Mouse_constructPage( PreferenceGroup& group ){
 	PreferencesPage page( group.createPage( "Mouse", "Mouse Preferences" ) );
@@ -117,7 +118,7 @@ CGameDescription::CGameDescription( xmlDocPtr pDoc, const CopiedString& gameFile
 	// read the user-friendly game name
 	xmlNodePtr pNode = pDoc->children;
 
-	while ( strcmp( (const char*)pNode->name, "game" ) && pNode != 0 )
+	while ( pNode != 0 && strcmp( (const char*)pNode->name, "game" ) )
 	{
 		pNode = pNode->next;
 	}
@@ -932,7 +933,8 @@ void PreferencesDialog_restartRequired( const char* staticName ){
 }
 
 void PreferencesDialog_showDialog(){
-	if ( ConfirmModified( "Edit Preferences" ) && g_Preferences.DoModal() == eIDOK ) {
+	//if ( ConfirmModified( "Edit Preferences" ) && g_Preferences.DoModal() == eIDOK ) {
+	if ( g_Preferences.DoModal() == eIDOK ) {
 		if ( !g_restart_required.empty() ) {
 			StringOutputStream message( 256 );
 			message << "Preference changes require a restart:\n";