From 6490672f399c980ecaf7a07a3f025d7c7339a761 Mon Sep 17 00:00:00 2001 From: adelikat Date: Wed, 11 Mar 2009 20:30:16 +0000 Subject: [PATCH] Renamed to 2.1 pre-release, minor code cleanup --- src/config.cpp | 15 ++++++++------- src/drivers/win/memview.cpp | 8 ++++---- src/drivers/win/res/ICON_1.ico | Bin 2238 -> 2238 bytes src/drivers/win/res/ICON_2.ico | Bin 2238 -> 2238 bytes src/drivers/win/texthook.cpp | 3 +-- src/drivers/win/window.cpp | 4 ++-- src/types.h | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/config.cpp b/src/config.cpp index 5a2212bf..4b7a78d5 100644 --- a/src/config.cpp +++ b/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"; diff --git a/src/drivers/win/memview.cpp b/src/drivers/win/memview.cpp index eeb4e8cc..4e0bf2b1 100644 --- a/src/drivers/win/memview.cpp +++ b/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;} diff --git a/src/drivers/win/res/ICON_1.ico b/src/drivers/win/res/ICON_1.ico index 23591d1f58112dec775705eae45b6d532c812af3..6a27479dbf66614ded373df6d5bc85863500bee4 100644 GIT binary patch literal 2238 zcmciEy>1jq5Ww-Wd=l7!u?R@%ko4Z5Ug6dmo75{H5;95zkfI}8Y1Pt>&;{UUsNkY| zh6^h212{y&V)%FWuJI=s%mx?XQnM#WRJZRVS6b5JQR6C>lq3Zd-V71j}iKD zk7Ls}7vU%FBXFcC5h3w^$oYRC8BAdyQ7QsCZlHyzFgPj#DPn>G1t;dH2;}y@g{Uw% zDgr4&Q)+?2;HU^BlN1yv433IGitv*xP#7E)ffN;{DFtmeI4S}uS_B0OgQFslI3Q=KjR0MLoE-yrd!BG*&@hWQ}Dh!T_K#tcOg{Uw%DgxO*fo35p433IG ziu3#~1?|ZVZLbKVIM45;Kw)rH1af>fEkuREQ4z@TNv#kS21i98$LHoI?h1pWB9LP# z)IwAk92J2a%Ona>VQ^FgvM(XeLR1(W6@irC`9lg621iBPb1bb=hzf(FB9LR*X(1{M zj*38zC257IFgPj#IhLyzqQc;)2;^AGwGb5sM@1mVGLJ%37#vm3zs@pI=Zq&Z_n*vj zYk|FWwZkvjj*iB#yLj^^MC(J@U!$NxMSeUF0S5A^0Mn{qosdR&~x_} zY%}*3>_*vsx}M zC&YO#|1?dlXtQb6vN=2)vw6NvZ-@LmO=oA*N}m6*=;E4-O8d#pA<1i3LNA z?eppB$5Wc*S-IS*-*p_fB`uI^8*`Z2`W{mo`ToI=cKNC2_5A*h@iOLlef;mm`q*EsU;h2)`sIiH^@|Vh-ZrgG-<#w2 tuW-@pA93V8f0IY^1uy)I$b)l{{p3H2fZuJO{s$@YbPjnvf7|OreFrIN^0@#2 literal 2238 zcmcK4O>Wdc5C+g1fkaNg+DmRhAH_$hWtJ#A#3EjD3@{5-B+`@T z@z>q%^4}!l!L@G0`~bAMO42HMS?)PHQAZKd6xueXx-fG0P-HKd_M$ zvB)GvtTIW_i!_qj3pPcQqF+cODf-DYk|JiAr06HwNQziwk|I`_r05sbNNT^p<|30K zCW)lz7vD&Vm}Qcp-H#3GXvvC1Sxzln{c_8Z#V)TD@MR$r#*H@lG(G0P-He-MqN zh(#tTVwFjX{?Hmp?GLc2-akc5slG(fA8sQlVwOpY{@@!)5sOSx#43{%CaEt|`wP>& zG)WQDqP|RFG4*ANm}QbeA@ya7SY(nSR+*&GslH6@FKF|UCPhrE`Z9%s)t4z^mPrZ= zt1nZ;B9j!c$|Qx2`ZBfuAlkU|W$Onqc?(Gjlhv0gVwOn?3#l(t#3GXvvC1TcqL!4Y z?FShDzn#zF@AYJWbF|Zw=C+?sHoa}# z$M;D6wJ>~oWxRJAKfN3u2aL_1_wMQXd$C^o;`+z9;fv?@I6f9Vk4hKUKRV5LvODI# x(Z>IP(H?Gp+&|pr{lmAr&%eHI`u@+`FZW%abdLDYtr73Kbe4zs$2N-E{02vZ6S)8Y diff --git a/src/drivers/win/res/ICON_2.ico b/src/drivers/win/res/ICON_2.ico index 6a27479dbf66614ded373df6d5bc85863500bee4..23591d1f58112dec775705eae45b6d532c812af3 100644 GIT binary patch literal 2238 zcmcK4O>Wdc5C+g1fkaNg+DmRhAH_$hWtJ#A#3EjD3@{5-B+`@T z@z>q%^4}!l!L@G0`~bAMO42HMS?)PHQAZKd6xueXx-fG0P-HKd_M$ zvB)GvtTIW_i!_qj3pPcQqF+cODf-DYk|JiAr06HwNQziwk|I`_r05sbNNT^p<|30K zCW)lz7vD&Vm}Qcp-H#3GXvvC1Sxzln{c_8Z#V)TD@MR$r#*H@lG(G0P-He-MqN zh(#tTVwFjX{?Hmp?GLc2-akc5slG(fA8sQlVwOpY{@@!)5sOSx#43{%CaEt|`wP>& zG)WQDqP|RFG4*ANm}QbeA@ya7SY(nSR+*&GslH6@FKF|UCPhrE`Z9%s)t4z^mPrZ= zt1nZ;B9j!c$|Qx2`ZBfuAlkU|W$Onqc?(Gjlhv0gVwOn?3#l(t#3GXvvC1TcqL!4Y z?FShDzn#zF@AYJWbF|Zw=C+?sHoa}# z$M;D6wJ>~oWxRJAKfN3u2aL_1_wMQXd$C^o;`+z9;fv?@I6f9Vk4hKUKRV5LvODI# x(Z>IP(H?Gp+&|pr{lmAr&%eHI`u@+`FZW%abdLDYtr73Kbe4zs$2N-E{02vZ6S)8Y literal 2238 zcmciEy>1jq5Ww-Wd=l7!u?R@%ko4Z5Ug6dmo75{H5;95zkfI}8Y1Pt>&;{UUsNkY| zh6^h212{y&V)%FWuJI=s%mx?XQnM#WRJZRVS6b5JQR6C>lq3Zd-V71j}iKD zk7Ls}7vU%FBXFcC5h3w^$oYRC8BAdyQ7QsCZlHyzFgPj#DPn>G1t;dH2;}y@g{Uw% zDgr4&Q)+?2;HU^BlN1yv433IGitv*xP#7E)ffN;{DFtmeI4S}uS_B0OgQFslI3Q=KjR0MLoE-yrd!BG*&@hWQ}Dh!T_K#tcOg{Uw%DgxO*fo35p433IG ziu3#~1?|ZVZLbKVIM45;Kw)rH1af>fEkuREQ4z@TNv#kS21i98$LHoI?h1pWB9LP# z)IwAk92J2a%Ona>VQ^FgvM(XeLR1(W6@irC`9lg621iBPb1bb=hzf(FB9LR*X(1{M zj*38zC257IFgPj#IhLyzqQc;)2;^AGwGb5sM@1mVGLJ%37#vm3zs@pI=Zq&Z_n*vj zYk|FWwZkvjj*iB#yLj^^MC(J@U!$NxMSeUF0S5A^0Mn{qosdR&~x_} zY%}*3>_*vsx}M zC&YO#|1?dlXtQb6vN=2)vw6NvZ-@LmO=oA*N}m6*=;E4-O8d#pA<1i3LNA z?eppB$5Wc*S-IS*-*p_fB`uI^8*`Z2`W{mo`ToI=cKNC2_5A*h@iOLlef;mm`q*EsU;h2)`sIiH^@|Vh-ZrgG-<#w2 tuW-@pA93V8f0IY^1uy)I$b)l{{p3H2fZuJO{s$@YbPjnvf7|OreFrIN^0@#2 diff --git a/src/drivers/win/texthook.cpp b/src/drivers/win/texthook.cpp index 996a9dec..93c99b8d 100644 --- a/src/drivers/win/texthook.cpp +++ b/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 diff --git a/src/drivers/win/window.cpp b/src/drivers/win/window.cpp index 7a3d431e..5e7b9bf8 100644 --- a/src/drivers/win/window.cpp +++ b/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"; diff --git a/src/types.h b/src/types.h index b9662f46..56b5e363 100644 --- a/src/types.h +++ b/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