From f57d92a1ab8f1a6c5bd11f4eabf364e4f0e10237 Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Wed, 19 Dec 2012 15:23:57 +0100
Subject: [PATCH] Renamed RBDoom3 to RBDoom3BFG

---
 neo/CMakeLists.txt           | 18 +++++++++---------
 neo/renderer/tr_local.h      |  2 +-
 neo/sys/linux/linux_main.cpp |  7 ++-----
 neo/sys/sdl/sdl_glimp.cpp    |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/neo/CMakeLists.txt b/neo/CMakeLists.txt
index 935ce253..83f18124 100644
--- a/neo/CMakeLists.txt
+++ b/neo/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-project(RBDoom3)
+project(RBDoom3BFG)
 
 option(USE_MFC_TOOLS
 		"Compile the built-in MFC based tools" OFF)
@@ -1011,16 +1011,16 @@ if(MSVC)
 
 	list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
 	
-	add_executable(RBDoom3 WIN32 ${RBDOOM3_SOURCES})
+	add_executable(RBDoom3BFG WIN32 ${RBDOOM3_SOURCES})
 		
-	#add_custom_command(TARGET RBDoom3
+	#add_custom_command(TARGET RBDoom3BFG
     #               PRE_BUILD
 	#			   COMMAND nmake ARGS /f Makefile.vc6 CFG=release
 	#			   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/libs/curl/lib
     #               COMMENT "Compiling libcURL")
 		
-	add_dependencies(RBDoom3 idlib)
-	target_link_libraries(RBDoom3
+	add_dependencies(RBDoom3BFG idlib)
+	target_link_libraries(RBDoom3BFG
 		idlib
 		${DirectX_LIBRARIES}
 		#libcurl 
@@ -1071,9 +1071,9 @@ else()
 
 	list(REMOVE_DUPLICATES RBDOOM3_SOURCES)
 	
-	add_executable(RBDoom3 WIN32 ${RBDOOM3_SOURCES})
+	add_executable(RBDoom3BFG WIN32 ${RBDOOM3_SOURCES})
 
-	add_dependencies(RBDoom3 idlib)
+	add_dependencies(RBDoom3BFG idlib)
 	
 	if(MINGW)
 		include_directories(libs/sdl2/include)
@@ -1083,7 +1083,7 @@ else()
 	
 	if(WIN32)
 	
-		target_link_libraries(RBDoom3
+		target_link_libraries(RBDoom3BFG
 			idlib
 			${DirectX_LIBRARIES}
 			#libcurl 
@@ -1101,7 +1101,7 @@ else()
 	endif()
 	
 	if(UNIX)	
-		target_link_libraries(RBDoom3
+		target_link_libraries(RBDoom3BFG
 			idlib
 			GL
 			pthread
diff --git a/neo/renderer/tr_local.h b/neo/renderer/tr_local.h
index 131bb85e..d9f866d5 100644
--- a/neo/renderer/tr_local.h
+++ b/neo/renderer/tr_local.h
@@ -1038,7 +1038,7 @@ struct vidMode_t
 	}
 	
 	vidMode_t( int width, int height, int displayHz ) :
-		width(width), height(height), displayHz(displayHz) {}
+		width( width ), height( height ), displayHz( displayHz ) {}
 	// RB end
 	
 	bool operator==( const vidMode_t& a )
diff --git a/neo/sys/linux/linux_main.cpp b/neo/sys/linux/linux_main.cpp
index 70001d7b..4132b537 100644
--- a/neo/sys/linux/linux_main.cpp
+++ b/neo/sys/linux/linux_main.cpp
@@ -54,11 +54,8 @@ static idStr	savepath;
  */
 const char* Sys_DefaultSavePath()
 {
-#if defined( ID_DEMO_BUILD )
-	sprintf( savepath, "%s/.rbdoom3-demo", getenv( "HOME" ) );
-#else
-	sprintf( savepath, "%s/.rbdoom3", getenv( "HOME" ) );
-#endif
+	sprintf( savepath, "%s/.rbdoom3bfg", getenv( "HOME" ) );
+	
 	return savepath.c_str();
 }
 /*
diff --git a/neo/sys/sdl/sdl_glimp.cpp b/neo/sys/sdl/sdl_glimp.cpp
index 5c9b267c..556112c0 100644
--- a/neo/sys/sdl/sdl_glimp.cpp
+++ b/neo/sys/sdl/sdl_glimp.cpp
@@ -457,7 +457,7 @@ bool R_GetModeListForDisplay( const int requestedDisplayNum, idList<vidMode_t>&
 		// requested invalid displaynum
 		return false;
 	}
-
+	
 	int numModes = SDL_GetNumDisplayModes( requestedDisplayNum );
 	if( numModes > 0 )
 	{