Renamed to 2.1 pre-release, minor code cleanup

src/config.cpp

@@ -14,8 +14,14 @@ static char *aboutString = 0;
 ///returns a string suitable for use in an aboutbox
 char *FCEUI_GetAboutString() {
 	const char *aboutTemplate = 
-	FCEU_NAME_AND_VERSION"\n\
-~CAST~\n\
+	"\t" FCEU_NAME_AND_VERSION "\n\n\
+Authors\n\
+zeromus, adelikat, CaH4e3\n\
+\n\
+FCEUX 2.0\n\
+qfox, _mz, nitsujrehtona, Lukas Sabota, SP\
+\n\n\
+Previous versions:\n\n\
 FCE - Bero\n\
 FCEU - Xodnizel\n\
 FCEU XD - Bbitmaster & Parasyte\n\
@@ -23,11 +29,6 @@ FCEU XD SP - Sebastian Porst\n\
 FCEU MM - CaH4e3\n\
 FCEU TAS - blip & nitsuja\n\
 FCEU TAS+ - Luke Gustafson\n\
-FCEUX\n\
- - SP, zeromus\n\
- - CaH4e3, Luke Gustafson, qfox\n\
- - adelikat, _mz, nitsujrehtona\n\
- - Lukas Sabota \n\
 \n\
 "__TIME__" "__DATE__"\n";
 

src/drivers/win/memview.cpp

@@ -1544,10 +1544,10 @@ void DoMemView() {
 		wndclass.hInstance     = fceu_hInstance;
 		wndclass.hIcon         = LoadIcon(fceu_hInstance, "ICON_1");
 		wndclass.hIconSm       = LoadIcon(fceu_hInstance, "ICON_1");
-		wndclass.hCursor       = LoadCursor (NULL, IDC_ARROW) ;
-		wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH) ;
-		wndclass.lpszMenuName  = "MEMVIEWMENU" ; //TODO: add a menu
-		wndclass.lpszClassName = "MEMVIEW" ;
+		wndclass.hCursor       = LoadCursor (NULL, IDC_ARROW);
+		wndclass.hbrBackground = (HBRUSH) GetStockObject(WHITE_BRUSH);
+		wndclass.lpszMenuName  = "MEMVIEWMENU";
+		wndclass.lpszClassName = "MEMVIEW";
 
 		if(!RegisterClassEx(&wndclass)) {FCEUD_PrintError("Error Registering MEMVIEW Window Class."); return;}
 

src/drivers/win/texthook.cpp

@@ -699,8 +699,7 @@ int TextHookerSaveTableFile(){
 	FP = fopen(nameo,"wb");
 	line = 0; //init the line counter
 
-	//char hex[2] = "00"; //holds the hex string to write
-	char hex[] = { 0 ,0 }; //adelikat changed ^ to this
+	char hex[] = { 0 ,0 };
 	
 	//write the table file to the file
 	for ( i = 0; i < 256; i++ ) { //go through each possible hex value

src/drivers/win/window.cpp

@@ -1779,8 +1779,8 @@ int CreateMainWindow()
 	winclass.cbClsExtra = 0;
 	winclass.cbWndExtra = 0;
 	winclass.hInstance = fceu_hInstance;
-	winclass.hIcon = LoadIcon(fceu_hInstance, "ICON_2");
-	winclass.hIconSm = LoadIcon(fceu_hInstance, "ICON_2");
+	winclass.hIcon = LoadIcon(fceu_hInstance, "ICON_1");
+	winclass.hIconSm = LoadIcon(fceu_hInstance, "ICON_1");
 	winclass.hCursor = LoadCursor(NULL, IDC_ARROW);
 	winclass.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); //mbg merge 7/17/06 added cast
 	winclass.lpszClassName = "FCEULTRA";

src/types.h

@@ -23,7 +23,7 @@
 #define __FCEU_TYPES
 
 #define FCEU_NAME "FCEUX"
-#define FCEU_VERSION_STRING "2.0.4-interim"
+#define FCEU_VERSION_STRING "2.1-pre-release"
 #define FCEU_VERSION_NUMERIC 20004
 #define FCEU_NAME_AND_VERSION FCEU_NAME " " FCEU_VERSION_STRING