More icon stuff

src/sdl/SDL_icon.xpm

@@ -1,81 +1,99 @@
 /* XPM */
 static char * SDL_icon_xpm[] = {
-"32 32 46 1",
+"64 64 32 1",
 " 	c None",
-".	c #000033",
+".	c #000271",
-"+	c #000045",
+"+	c #03035D",
-"@	c #00006C",
+"@	c #00009F",
-"#	c #01007E",
+"#	c #0A0A1B",
-"$	c #000193",
+"$	c #08058E",
-"%	c #00009F",
+"%	c #060E4C",
-"&	c #060766",
+"&	c #11110E",
-"*	c #0F0F10",
+"*	c #101339",
-"=	c #0C11CC",
+"=	c #0D11CC",
-"-	c #0D13B8",
+"-	c #1B1CFD",
-";	c #1415E0",
+";	c #342B24",
-">	c #1E1AED",
+">	c #2325EC",
-",	c #1B1CFE",
+",	c #3C3883",
-"'	c #272576",
+"'	c #3D3A9E",
-")	c #313179",
+")	c #5B5170",
-"!	c #3A3AB1",
+"!	c #4B4CFF",
-"~	c #3A3AFF",
+"~	c #795339",
-"{	c #434497",
+"{	c #5E5B5C",
-"]	c #4F4AAE",
+"]	c #5F5ED3",
-"^	c #4748FE",
+"^	c #5E5EFB",
-"/	c #494DE8",
+"/	c #7271FF",
-"(	c #7A5137",
+"(	c #B37F5D",
-"_	c #5E57A7",
+"_	c #8F8883",
-":	c #5957C4",
+":	c #8887FF",
-"<	c #616360",
+"<	c #D59E76",
-"[	c #855E93",
+"[	c #ABABA9",
-"}	c #796979",
+"}	c #A9AAFF",
-"|	c #9C6473",
+"|	c #C1C3C1",
-"1	c #6D6EF4",
+"1	c #FAC296",
-"2	c #7171FF",
+"2	c #D4D6D3",
-"3	c #817F9D",
+"3	c #F9FCF8",
-"4	c #B37C5A",
+"                                                                ",
-"5	c #898A8D",
+"                                                                ",
-"6	c #A28572",
+"                              #***,,,****                       ",
-"7	c #A3829B",
+"                          *,,]]]]]]]]]]]]]',,**                 ",
-"8	c #8988FF",
+"                       *,']//////////////////]]',*              ",
-"9	c #C39D82",
+"                    *,']/////////////////////////]'%            ",
-"0	c #ABADAB",
+"                  *,]////////////////////^^!!>>>>>>>$+          ",
-"a	c #DCA57C",
+"                *,]////////////////////!>---------->=@%         ",
-"b	c #ABAAFE",
+"    *          ,]///////////////////]^>------->==@@@$.#         ",
-"c	c #C1C3C0",
+"   +',       *']//////////////////],,,=---->=@@@@@$.%           ",
-"d	c #F7C095",
+"  #.=^'*    ,]//////////////////],']^]$--=@@@@@@@$+#            ",
-"e	c #CFD1CE",
+"  %$=-^'*  ,]/////////////////],]/!>-^'=@@@@@@@$.%              ",
-"f	c #DDE0DD",
+"  +$=->/,*,//////////////////]'/^!,$-!,$@@@@@@$+*               ",
-"g	c #FAFCF9",
+"  +@=--!''/////////////////]']^!,(()->%$@@@@@$+#                ",
+"  +@=--='/////////////////]']^${(<<)->,$@@@@$%                  ",
+"  +@=->']/////////:::////]]/^'(<111)->,$@@@$%                   ",
+" #+@@>$]////////::}}}://///!,(<1111)--%$@@.%                    ",
+" #+@@$$^////////:}}}}}://^>$(<<1111)--+$@.%                     ",
+"  +@$.>^///////:}}}}}}:/^>->,(<111<'--+$$*#                     ",
+"  +$.=-!///////:}}}}}:^!-----@(111<@--+$,'],,*                  ",
+"  %+%=->^///////:}}}:!--------@(11(=--$=^////],*                ",
+"  ,]]'>->^//////^^!!-----------'<1_>--@-!//////]'*              ",
+"  '!->@--->>>>>>--->===>--------)<,-->@->^///////]',            ",
+" *$--->----------='){__{'>------>'=--=@-->!^///////],*          ",
+" %$.=---------->$)[22332[)=----------=>----->^^//////],         ",
+" %$_,--------->'_|3333333['----------=--------->!^////],#       ",
+" *'[{=--------'_2333333333_=---------------------->!^///,*      ",
+" #)[_@-------@_|33333333332,------------------------->!^/'*     ",
+" #)2[$------=)|333332|23333{>--------------------------->^'*    ",
+"  {2|,------$[233333___3333_=----------------------------->$    ",
+"  ;22)=---->)|333332{2_2333[@-------------------------------$   ",
+"  &22{@----$_233333|{2||333|'--------------------------------$  ",
+"  &|3_.----,|333333[;2|[333|'--------------------------------=+ ",
+"   [3_%=--={2333333[&___333|'-------------------->>>====>>----@ ",
+"   _3[#$=@.[2333333[&&&_333[$------------->>==@@@@@@@@@@@@@@@==+",
+"   {3|;+$$)|3333333[&&&[333_=-------->==@@@@@@@@@@@@@@@$$$$.+++%",
+"   {23{*$${23333333|;&&|332)>----->=@@@@@@@@@@@@@@$$$.++%**     ",
+";{{;[3{&*)[333333333{&&|332,=---==@@@@@@@@@@@@$$.++%*           ",
+"{22_{|[;_|2333333333_&;233_$@@@@@@@@@@@@@@@@$$+%*               ",
+"&_|2{;{{[233333333332_[33[,$@@@@@@@@@@@@@$$+%#                  ",
+" &;{&&&;~(_|3333333333332)$@@@@@@@@@@@@$.+%#                    ",
+"  &&&&&;(11([33333333332{$@@@@@@@@@@@$...$@$*                   ",
+"    &~((1111<[333333332{%.$@@@@@@@@@$$$$@=--$                   ",
+"     ~<<11111<[33333|[_(<~,$@@@@@@@@@@@@@>-->.                  ",
+"     ;(<111111<(____(11111(+@@@@@@@@@@@@=----=%                 ",
+"      ~(<11111111<11111<(<<;$@@$$@@@@@@@=-----.                 ",
+"       ~(<1111111111111(~<1{$$$.$@@@@@@@=-----=                 ",
+"        ~(<1111111<<(((<11<*$+.$@@@@@@@@@>---->+                ",
+"         ;(<1111111<<1111<~%+$@@@@@@@@@@@=-----$                ",
+"           ~(<<111111111(~&*+$$$@@@@@@@@@@=----=%               ",
+"             ;~((<<<<(~~;    *%+$$@@@@@@@@@>----+               ",
+"                 ;;;            #%+$$@@@@@@@----.               ",
+"                                   *+$$@@@@@=---@               ",
+"                                     *+$@@@@@>--=               ",
+"                                       *.$@@@@-->%              ",
+"                                        #%.$@@=->+              ",
+"                                          *+$@@>-$              ",
+"                                            %$@=-$              ",
+"                                             %.@>@              ",
+"                                               +=@              ",
+"                                                ..              ",
+"                                                 *              ",
 "                                                                ",
-"              {]]]]]])          ",
-"           {:1222222221::)      ",
-"         :1222222222^^>,,>%     ",
-"  '    ]122222222:]>,,;=%$&     ",
-" @~]  :222222221://-=%%%#.      ",
-" #>^{122222222:1][~&%%%@        ",
-" #>=122221221:/|a4,&%$&         ",
-" #-!22228bb12/4ad9,&$+          ",
-" ##^2221bbb2~,!ad7,@'{          ",
-" )!,/22281^,,,,:d_,-221:)       ",
-" /,;,,>,,-_!;,,,[=>=~2222:      ",
-" {=,,,,;3fgg0;,,,,;,,,~^221{    ",
-" 3_,,,>5ggggg3,,,,,,,,,,,>^2]   ",
-" 05,,,_fgg0egc>,,,,,,,,,,,,,~!  ",
-" 00>,>0ggf00gf;,,,,,,,,,,,,,,,- ",
-" 5e%,!fggf55gf=,,,,,,,,,,>>>>,, ",
-" <f+%5gggf*<ge;,,,,>==-%%%%%%$$#",
-"  f*@cgggg*5g0>,>-%%%%%%$@@+    ",
-"5e<<cggggg5cg)%%%%%%%$@+        ",
-" ***99fggggg3%%%%%%#@@          ",
-"  (4dd9fggf6}$%%%%$$=,%         ",
-"   4dddd99dda6%$$%%%;,>         ",
-"    4ddddda9a6$#%%%%=,,-        ",
-"     4addddda*#%%%%%%>,;        ",
-"       (444    +@$%%%-,,        ",
-"                  &$%%=,$       ",
-"                    &$%>-       ",
-"                     +#-=       ",
-"                       @-       ",
-"                        &       ",
 "                                                                "};

src/sdl/i_video.c

@@ -41,7 +41,7 @@
 
 #ifdef HAVE_IMAGE
 #include "SDL_image.h"
-#elif 1
+#elif defined (__unix__) || defined(__APPLE__) || defined (UNIXCOMMON) // Windows doesn't need this, as SDL will do it for us.
 #define LOAD_XPM //I want XPM!
 #include "IMG_xpm.c" //Alam: I don't want to add SDL_Image.dll/so
 #define HAVE_IMAGE //I have SDL_Image, sortof

src/win32/Srb2win.rc

@@ -1,6 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
+#include "winver.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
@@ -62,9 +63,11 @@ END
 // Version
 //
 
+#include "../doomdef.h" // Needed for version string
+
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,9,0
+ FILEVERSION 2,2
- PRODUCTVERSION 1,0,9,0
+ PRODUCTVERSION 2,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -82,14 +85,14 @@ BEGIN
             VALUE "Comments", "Visit our web site at www.srb2.org for news and updates!\0"
             VALUE "CompanyName", "Sonic Team Junior\0"
             VALUE "FileDescription", "Sonic Robo Blast 2\0"
-            VALUE "FileVersion", "1, 09\0"
+            VALUE "FileVersion", "2.2\0"
             VALUE "InternalName", "srb2\0"
-            VALUE "LegalCopyright", "Copyright <EFBFBD> 1998-2018 by Sonic Team Junior\0"
+            VALUE "LegalCopyright", "Copyright 1998-2019 by Sonic Team Junior\0"
             VALUE "LegalTrademarks", "Sonic the Hedgehog and related characters are trademarks of Sega.\0"
             VALUE "OriginalFilename", "srb2win.exe\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "Sonic Robo Blast 2\0"
-            VALUE "ProductVersion", "1, 09\0"
+            VALUE "ProductVersion", "2.2\0"
             VALUE "SpecialBuild", "\0"
         END
     END