From: Ryan Flegel Date: Thu, 13 May 2004 23:16:46 +0000 (+0000) Subject: - added freedesktop.org .desktop file from Mike Hearn X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e22e8eff6e585048d92bc92619525fc1e9122e71;p=supertux.git - added freedesktop.org .desktop file from Mike Hearn - added supertux icons as supertux.xpm and supertux.png (old ones can be [re]moved) - added TODO item SVN-Revision: 1166 --- diff --git a/TODO b/TODO index 2ffb8a5b1..10a58289c 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,7 @@ Todo H: high priority L: low priority +[H] AX_CHECK_GL produces an error during configure [M] Enemies can get stuck when colliding. [M] When aborting a level, lives and score should remain the same as they were before. Solution: make more dependency between the game engine and worldmap diff --git a/data/Makefile.am b/data/Makefile.am index 970cc2fe4..45281687f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,12 +1,16 @@ +iconsdir=$(datadir)/pixmaps +icons_DATA = images/supertux.xpm + +desktopdir = $(datadir)/applications +desktop_DATA = supertux.desktop + EXTRA_DIST = \ supertux.strf \ intro.txt \ extro.txt \ CREDITS \ $(wildcard sounds/*.wav) \ - images/icon.xpm \ $(wildcard images/*.png) \ - $(wildcard images/*.xpm) \ $(wildcard images/background/*.png) \ $(wildcard images/background/*.jpg) \ $(wildcard images/highscore/*.png) \ diff --git a/data/images/icon.xpm b/data/images/icon.xpm deleted file mode 100644 index 0c0e01d57..000000000 --- a/data/images/icon.xpm +++ /dev/null @@ -1,497 +0,0 @@ -/* XPM */ -static char * icon_xpm[] = { -"32 32 462 2", -" c None", -". c #5AA7EF", -"+ c #66B4FC", -"@ c #5CA9EF", -"# c #5AA6EF", -"$ c #5EB0FC", -"% c #70B8FE", -"& c #66ADF0", -"* c #62ABEF", -"= c #5EA9EF", -"- c #5AA8EF", -"; c #79BEFE", -"> c #6EB2F1", -", c #6BB0F0", -"' c #67AEF0", -") c #5CA7EF", -"! c #82C2FF", -"~ c #78B8F2", -"{ c #73B5F2", -"] c #70B3F3", -"^ c #6CB2F2", -"/ c #68B0F3", -"( c #64ACF1", -"_ c #5FAAF0", -": c #5CA8F0", -"< c #8BC7FF", -"[ c #81BCF3", -"} c #7EBDF7", -"| c #7ABAF6", -"1 c #75B5F2", -"2 c #6FB2EF", -"3 c #6AADED", -"4 c #69B0F4", -"5 c #68B3F8", -"6 c #62AEF5", -"7 c #5CA9F1", -"8 c #5FAEFC", -"9 c #94CDFF", -"0 c #8AC2F6", -"a c #85C2F9", -"b c #77AEE1", -"c c #688DB1", -"d c #5B7186", -"e c #485663", -"f c #283848", -"g c #26415B", -"h c #3F6B96", -"i c #5CA0DE", -"j c #63B1F8", -"k c #5DAAF2", -"l c #5EAFFC", -"m c #A6DBFF", -"n c #93C5F5", -"o c #90C7FB", -"p c #73A1CB", -"q c #515E6A", -"r c #575554", -"s c #4E4B48", -"t c #3E3B38", -"u c #090602", -"v c #020000", -"w c #050100", -"x c #0D1C2A", -"y c #4E8AC0", -"z c #63B1F9", -"A c #63B9FF", -"B c #AFE1FF", -"C c #A2D4FF", -"D c #99CCF9", -"E c #8DBEEC", -"F c #515E6D", -"G c #534F4C", -"H c #555452", -"I c #3E3E3D", -"J c #1C1C1D", -"K c #242321", -"L c #BEBAAA", -"M c #D6D1BF", -"N c #3B342E", -"O c #213950", -"P c #66B1F5", -"Q c #62ADF2", -"R c #63B2FC", -"S c #64B9FF", -"T c #B0DBFF", -"U c #A3CEF6", -"V c #9ECCF6", -"W c #A3D4FF", -"X c #6987A2", -"Y c #434343", -"Z c #575654", -"` c #484848", -" . c #333333", -".. c #070708", -"+. c #969286", -"@. c #FFFFF9", -"#. c #9F9D9D", -"$. c #393638", -"%. c #040A10", -"&. c #5CA1E9", -"*. c #61AEFC", -"=. c #5DAAF4", -"-. c #5BA9F1", -";. c #5FAFFD", -">. c #B9E1FF", -",. c #ABD2F7", -"'. c #A8D0F6", -"). c #A5D1FA", -"!. c #A1CFFA", -"~. c #3B4753", -"{. c #454340", -"]. c #565555", -"^. c #454545", -"/. c #363636", -"(. c #090A0B", -"_. c #BEB6AA", -":. c #FFFFFE", -"<. c #5E595B", -"[. c #0F0E14", -"}. c #3D3000", -"|. c #ABBC85", -"1. c #8FBCC0", -"2. c #6AAEE9", -"3. c #5AAAF9", -"4. c #57A8F6", -"5. c #5BAEFF", -"6. c #C3E5FF", -"7. c #B5D7F7", -"8. c #B0D5F7", -"9. c #ACD2F8", -"0. c #AED7FF", -"a. c #8CB2D3", -"b. c #171C21", -"c. c #474543", -"d. c #545454", -"e. c #3B3B3B", -"f. c #0D0E0F", -"g. c #716B61", -"h. c #DFDFDD", -"i. c #C8C3C4", -"j. c #9D8C68", -"k. c #DDB82A", -"l. c #FFE220", -"m. c #FFE218", -"n. c #FADA2C", -"o. c #D2CA61", -"p. c #AEBF8A", -"q. c #7AAFCA", -"r. c #5CB0FF", -"s. c #CBEAFF", -"t. c #BDDBF8", -"u. c #B9D9F8", -"v. c #B3D7F9", -"w. c #B3DAFF", -"x. c #6F8AA4", -"y. c #0F1012", -"z. c #424241", -"A. c #3F3F3F", -"B. c #323232", -"C. c #0E0E0F", -"D. c #060503", -"E. c #3F3E39", -"F. c #736658", -"G. c #CB9850", -"H. c #E2AB3E", -"I. c #F1BC36", -"J. c #F4BF2B", -"K. c #F0B124", -"L. c #F0B420", -"M. c #DEBB45", -"N. c #91B4B0", -"O. c #5AA8F4", -"P. c #60AFFC", -"Q. c #D5EEFF", -"R. c #C6E0F9", -"S. c #C2DEF8", -"T. c #BDDCF8", -"U. c #B9D9F9", -"V. c #BBDEFF", -"W. c #A6CAE9", -"X. c #29343D", -"Y. c #131211", -"Z. c #3C3B3B", -"`. c #2F2F2F", -" + c #151515", -".+ c #090909", -"++ c #000000", -"@+ c #634222", -"#+ c #84592E", -"$+ c #A07448", -"%+ c #9B9FA5", -"&+ c #80A4CB", -"*+ c #71ACE6", -"=+ c #6BAFF0", -"-+ c #63ADF6", -";+ c #61ABF3", -">+ c #5FAAEF", -",+ c #62B1FC", -"'+ c #DEF3FF", -")+ c #CFE5FA", -"!+ c #CAE2F9", -"~+ c #C6E1F9", -"{+ c #C2E0F8", -"]+ c #C0DFFB", -"^+ c #65798C", -"/+ c #0D0E0D", -"(+ c #323130", -"_+ c #414141", -":+ c #2B2B2B", -"<+ c #0D0D0D", -"[+ c #1B1C1F", -"}+ c #373534", -"|+ c #474C4E", -"1+ c #73B9FC", -"2+ c #71B5F7", -"3+ c #6FB2F4", -"4+ c #6CB1F1", -"5+ c #63ACF0", -"6+ c #5EAAF1", -"7+ c #DBEBFB", -"8+ c #D7E9FA", -"9+ c #D2E8FA", -"0+ c #CEE5FA", -"a+ c #CAE2FA", -"b+ c #C8E2FA", -"c+ c #CAE8FF", -"d+ c #A0BAD1", -"e+ c #1E2021", -"f+ c #2F2E2C", -"g+ c #3E3E3E", -"h+ c #262626", -"i+ c #050505", -"j+ c #9C9C9D", -"k+ c #DFDFDF", -"l+ c #D0D0CF", -"m+ c #93AFCB", -"n+ c #76B3EC", -"o+ c #75B7F2", -"p+ c #74B5F1", -"q+ c #70B3F1", -"r+ c #6CB1F0", -"s+ c #68AEF0", -"t+ c #62ACEF", -"u+ c #60AAEF", -"v+ c #5DA9EF", -"w+ c #DFEDFB", -"x+ c #DDECFB", -"y+ c #D7EAFA", -"z+ c #D3E8FA", -"A+ c #CDE6FB", -"B+ c #C9E1FA", -"C+ c #4D5862", -"D+ c #262422", -"E+ c #4A4A49", -"F+ c #444444", -"G+ c #303030", -"H+ c #0C0C0C", -"I+ c #0B0B0B", -"J+ c #161616", -"K+ c #222222", -"L+ c #959595", -"M+ c #FFFFFF", -"N+ c #FFFEFA", -"O+ c #9CC0E0", -"P+ c #77B7F3", -"Q+ c #79B7F2", -"R+ c #75B5F1", -"S+ c #71B3F1", -"T+ c #6DB1F0", -"U+ c #69AEF0", -"V+ c #65ACEF", -"W+ c #DEEFFB", -"X+ c #D8EAFA", -"Y+ c #D4E8FA", -"Z+ c #D3EAFF", -"`+ c #BAD1E6", -" @ c #30363A", -".@ c #3C3B3A", -"+@ c #505050", -"@@ c #464646", -"#@ c #191919", -"$@ c #1D1D1D", -"%@ c #A0A0A0", -"&@ c #EFEFEF", -"*@ c #FFFEFE", -"=@ c #D7DBDD", -"-@ c #73AEE7", -";@ c #7CBBF6", -">@ c #78B6F4", -",@ c #ECFBFF", -"'@ c #DCECFB", -")@ c #D9EAFA", -"!@ c #D9EFFF", -"~@ c #ACBED2", -"{@ c #262B31", -"]@ c #424142", -"^@ c #555555", -"/@ c #353535", -"(@ c #1B1B1B", -"_@ c #606060", -":@ c #C2C2C2", -"<@ c #FEFEFE", -"[@ c #F3EFEF", -"}@ c #79A8D9", -"|@ c #88C2F4", -"1@ c #7CBAF5", -"2@ c #77B8FA", -"3@ c #76B6F1", -"4@ c #76BCFE", -"5@ c #DFEFFB", -"6@ c #DEEDFD", -"7@ c #CDCD9F", -"8@ c #4D4B30", -"9@ c #373841", -"0@ c #58585A", -"a@ c #3D3D3D", -"b@ c #202020", -"c@ c #232323", -"d@ c #2C2C2C", -"e@ c #8C8C8C", -"f@ c #EBEBEB", -"g@ c #FDFBFF", -"h@ c #B2BC9A", -"i@ c #FFEC23", -"j@ c #BBBA4D", -"k@ c #7ABDFF", -"l@ c #7AB8F1", -"m@ c #DFEFFD", -"n@ c #DCE6EC", -"o@ c #D2BB53", -"p@ c #C5AB1A", -"q@ c #424137", -"r@ c #4E4F59", -"s@ c #3D3D3F", -"t@ c #212121", -"u@ c #0A0A0A", -"v@ c #C5C5C5", -"w@ c #F6F7FF", -"x@ c #BDB348", -"y@ c #E8CC00", -"z@ c #A09532", -"A@ c #7EC0FF", -"B@ c #F0FEFF", -"C@ c #C9C39A", -"D@ c #CFAF25", -"E@ c #D7BD22", -"F@ c #646146", -"G@ c #3B3C44", -"H@ c #2C2D2E", -"I@ c #030303", -"J@ c #383838", -"K@ c #9F9F9F", -"L@ c #828282", -"M@ c #929292", -"N@ c #DEDEDE", -"O@ c #F0F0F0", -"P@ c #FCFCFC", -"Q@ c #D3D5DE", -"R@ c #96833B", -"S@ c #998D48", -"T@ c #8CB5D0", -"U@ c #C6CED3", -"V@ c #99894D", -"W@ c #D2B51F", -"X@ c #C2AF30", -"Y@ c #54533F", -"Z@ c #353640", -"`@ c #2D2D2E", -" # c #242424", -".# c #D7D7D7", -"+# c #CCCCCC", -"@# c #CFCFCF", -"## c #D0D0D0", -"$# c #D5D5D5", -"%# c #E5E5E5", -"&# c #EFEFF0", -"*# c #BDBBB9", -"=# c #877F4A", -"-# c #8FAAB0", -";# c #1B1E23", -"># c #302D28", -",# c #937D25", -"'# c #D8BE23", -")# c #C6B921", -"!# c #454542", -"~# c #282937", -"{# c #141419", -"]# c #1E1E1F", -"^# c #E1E1E1", -"/# c #D2D2D2", -"(# c #D9D9D9", -"_# c #DEDDDE", -":# c #99947E", -"<# c #97B0B0", -"[# c #12141B", -"}# c #463F2B", -"|# c #987F21", -"1# c #EBD319", -"2# c #CEC222", -"3# c #3E3C17", -"4# c #131301", -"5# c #4E4E4F", -"6# c #969696", -"7# c #B5B5B5", -"8# c #C0C0C1", -"9# c #B7B7B9", -"0# c #B7B6B5", -"a# c #9D9E92", -"b# c #97AEB4", -"c# c #000001", -"d# c #141515", -"e# c #726841", -"f# c #A78F1F", -"g# c #D7C20D", -"h# c #D5CA04", -"i# c #CEC402", -"j# c #8C8402", -"k# c #070400", -"l# c #000002", -"m# c #1F1F23", -"n# c #36311E", -"o# c #615F46", -"p# c #92A7AE", -"q# c #B3AD88", -"r# c #7D6A1A", -"s# c #87730D", -"t# c #9C890D", -"u# c #A69A2C", -"v# c #8F9795", -"w# c #8594A6", -"x# c #7E8D99", -"y# c #4D4319", -"z# c #493B03", -"A# c #645001", -"B# c #A2AD9A", -"C# c #EEFFFF", -"D# c #EBFDFF", -"E# c #E6FAFF", -"F# c #E1F8FF", -"G# c #DEF5FF", -"H# c #DCF4FF", -"I# c #DBF5FF", -"J# c #D9F6FF", -"K# c #D4F4FF", -"L# c #CBEEFF", -"M# c #E4F0FC", -"N# c #E2EEFB", -"O# c #D9EBFB", -"P# c #D4E8FB", -"Q# c #D1E6FA", -"R# c #CDE4FA", -"S# c #C8E2F9", -"T# c #F0FDFF", -"U# c #E1EFFB", -"V# c #DEEDFB", -"W# c #D5E9FB", -"X# c #E6F0FC", -"Y# c #E2EFFC", -"Z# c #DEEDFC", -"`# c #DAEBFB", -" $ c #E5F1FC", -".$ c #E2F0FC", -" . . ", -" + @ # $ ", -" % & * = - $ ", -" ; > , ' * = ) $ ", -" ! ~ { ] ^ / ( _ : $ ", -" < [ } | 1 2 3 4 5 6 7 8 ", -" 9 0 a b c d e f g h i j k l ", -" m n o p q r s t u v w x y z : A ", -" B C D E F G H I J K L M N O P Q R S ", -" T U V W X Y Z ` ...+.@.#.$.%.&.*.=.-.;. ", -" >.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5. ", -" 6.7.8.9.0.a.b.c.d.` e.f.g.h.i.j.k.l.m.n.o.p.q.r. ", -" s.t.u.7.v.w.x.y.z.A.B.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P. ", -" Q.R.S.T.U.V.W.X.Y.Z.`. +.+++++++++@+#+$+%+&+*+=+-+;+>+,+ ", -" '+)+!+~+{+]+6.^+/+(+_+:+<+++++++++++[+}+|+2 1+2+3+4+' 5+6+,+ ", -"7+8+9+0+a+b+c+d+e+f+Y g+h+i+++++++++ +j+k+l+m+n+o+p+q+r+s+t+u+v+", -"w+x+y+z+)+A+B+C+D+E+F+A.G+H+I+J+++K+L+M+M+M+N+O+P+Q+R+S+T+U+V+u+", -" W+x+X+Y+Z+`+ @.@+@@@g+#@++++$@Y %@&@M+M+*@M+=@-@;@>@1 S+T+U+ ", -" ,@'@)@!@~@{@]@^@@@/@(@I+++++_@:@&@M+M+<@M+[@}@|@1@2@3@4@ ", -" 5@6@5@7@8@9@0@a@b@<+$@c@++++d@e@f@M+<@M+g@h@i@j@k@l@ ", -" m@n@o@p@q@r@s@t@u@H+A.B.++++G+v@M+M+M+w@x@y@z@A@ ", -" B@C@D@E@F@G@H@#@++I@J@K@L@M@N@O@P@<@Q@R@S@T@ ", -" U@V@W@X@Y@Z@`@I+++ #.#+#@###$#%#&#*#=#-# ", -" ;#>#,#'#)#!#~#{#++]#@#^#^#$#/#(#_#:#<# ", -" ++[#}#|#1#2#3#4#++++5#6#7#8#9#0#a#b# ", -" c#d#e#f#g#h#i#j#k#++++l#m#n#o#p# ", -" q#r#s#t#u#v#w#x#y#z#A#B# ", -" C#D#E#F#G#H#I#J#K#L# ", -" M#N#x+O#P#Q#R#S# ", -" T#U#V#O#W#H# ", -" X#Y#Z#`# ", -" $.$ "}; diff --git a/data/images/supertux.png b/data/images/supertux.png new file mode 100644 index 000000000..bb5ad7ef0 Binary files /dev/null and b/data/images/supertux.png differ diff --git a/data/images/supertux.xpm b/data/images/supertux.xpm new file mode 100644 index 000000000..0c0e01d57 --- /dev/null +++ b/data/images/supertux.xpm @@ -0,0 +1,497 @@ +/* XPM */ +static char * icon_xpm[] = { +"32 32 462 2", +" c None", +". c #5AA7EF", +"+ c #66B4FC", +"@ c #5CA9EF", +"# c #5AA6EF", +"$ c #5EB0FC", +"% c #70B8FE", +"& c #66ADF0", +"* c #62ABEF", +"= c #5EA9EF", +"- c #5AA8EF", +"; c #79BEFE", +"> c #6EB2F1", +", c #6BB0F0", +"' c #67AEF0", +") c #5CA7EF", +"! c #82C2FF", +"~ c #78B8F2", +"{ c #73B5F2", +"] c #70B3F3", +"^ c #6CB2F2", +"/ c #68B0F3", +"( c #64ACF1", +"_ c #5FAAF0", +": c #5CA8F0", +"< c #8BC7FF", +"[ c #81BCF3", +"} c #7EBDF7", +"| c #7ABAF6", +"1 c #75B5F2", +"2 c #6FB2EF", +"3 c #6AADED", +"4 c #69B0F4", +"5 c #68B3F8", +"6 c #62AEF5", +"7 c #5CA9F1", +"8 c #5FAEFC", +"9 c #94CDFF", +"0 c #8AC2F6", +"a c #85C2F9", +"b c #77AEE1", +"c c #688DB1", +"d c #5B7186", +"e c #485663", +"f c #283848", +"g c #26415B", +"h c #3F6B96", +"i c #5CA0DE", +"j c #63B1F8", +"k c #5DAAF2", +"l c #5EAFFC", +"m c #A6DBFF", +"n c #93C5F5", +"o c #90C7FB", +"p c #73A1CB", +"q c #515E6A", +"r c #575554", +"s c #4E4B48", +"t c #3E3B38", +"u c #090602", +"v c #020000", +"w c #050100", +"x c #0D1C2A", +"y c #4E8AC0", +"z c #63B1F9", +"A c #63B9FF", +"B c #AFE1FF", +"C c #A2D4FF", +"D c #99CCF9", +"E c #8DBEEC", +"F c #515E6D", +"G c #534F4C", +"H c #555452", +"I c #3E3E3D", +"J c #1C1C1D", +"K c #242321", +"L c #BEBAAA", +"M c #D6D1BF", +"N c #3B342E", +"O c #213950", +"P c #66B1F5", +"Q c #62ADF2", +"R c #63B2FC", +"S c #64B9FF", +"T c #B0DBFF", +"U c #A3CEF6", +"V c #9ECCF6", +"W c #A3D4FF", +"X c #6987A2", +"Y c #434343", +"Z c #575654", +"` c #484848", +" . c #333333", +".. c #070708", +"+. c #969286", +"@. c #FFFFF9", +"#. c #9F9D9D", +"$. c #393638", +"%. c #040A10", +"&. c #5CA1E9", +"*. c #61AEFC", +"=. c #5DAAF4", +"-. c #5BA9F1", +";. c #5FAFFD", +">. c #B9E1FF", +",. c #ABD2F7", +"'. c #A8D0F6", +"). c #A5D1FA", +"!. c #A1CFFA", +"~. c #3B4753", +"{. c #454340", +"]. c #565555", +"^. c #454545", +"/. c #363636", +"(. c #090A0B", +"_. c #BEB6AA", +":. c #FFFFFE", +"<. c #5E595B", +"[. c #0F0E14", +"}. c #3D3000", +"|. c #ABBC85", +"1. c #8FBCC0", +"2. c #6AAEE9", +"3. c #5AAAF9", +"4. c #57A8F6", +"5. c #5BAEFF", +"6. c #C3E5FF", +"7. c #B5D7F7", +"8. c #B0D5F7", +"9. c #ACD2F8", +"0. c #AED7FF", +"a. c #8CB2D3", +"b. c #171C21", +"c. c #474543", +"d. c #545454", +"e. c #3B3B3B", +"f. c #0D0E0F", +"g. c #716B61", +"h. c #DFDFDD", +"i. c #C8C3C4", +"j. c #9D8C68", +"k. c #DDB82A", +"l. c #FFE220", +"m. c #FFE218", +"n. c #FADA2C", +"o. c #D2CA61", +"p. c #AEBF8A", +"q. c #7AAFCA", +"r. c #5CB0FF", +"s. c #CBEAFF", +"t. c #BDDBF8", +"u. c #B9D9F8", +"v. c #B3D7F9", +"w. c #B3DAFF", +"x. c #6F8AA4", +"y. c #0F1012", +"z. c #424241", +"A. c #3F3F3F", +"B. c #323232", +"C. c #0E0E0F", +"D. c #060503", +"E. c #3F3E39", +"F. c #736658", +"G. c #CB9850", +"H. c #E2AB3E", +"I. c #F1BC36", +"J. c #F4BF2B", +"K. c #F0B124", +"L. c #F0B420", +"M. c #DEBB45", +"N. c #91B4B0", +"O. c #5AA8F4", +"P. c #60AFFC", +"Q. c #D5EEFF", +"R. c #C6E0F9", +"S. c #C2DEF8", +"T. c #BDDCF8", +"U. c #B9D9F9", +"V. c #BBDEFF", +"W. c #A6CAE9", +"X. c #29343D", +"Y. c #131211", +"Z. c #3C3B3B", +"`. c #2F2F2F", +" + c #151515", +".+ c #090909", +"++ c #000000", +"@+ c #634222", +"#+ c #84592E", +"$+ c #A07448", +"%+ c #9B9FA5", +"&+ c #80A4CB", +"*+ c #71ACE6", +"=+ c #6BAFF0", +"-+ c #63ADF6", +";+ c #61ABF3", +">+ c #5FAAEF", +",+ c #62B1FC", +"'+ c #DEF3FF", +")+ c #CFE5FA", +"!+ c #CAE2F9", +"~+ c #C6E1F9", +"{+ c #C2E0F8", +"]+ c #C0DFFB", +"^+ c #65798C", +"/+ c #0D0E0D", +"(+ c #323130", +"_+ c #414141", +":+ c #2B2B2B", +"<+ c #0D0D0D", +"[+ c #1B1C1F", +"}+ c #373534", +"|+ c #474C4E", +"1+ c #73B9FC", +"2+ c #71B5F7", +"3+ c #6FB2F4", +"4+ c #6CB1F1", +"5+ c #63ACF0", +"6+ c #5EAAF1", +"7+ c #DBEBFB", +"8+ c #D7E9FA", +"9+ c #D2E8FA", +"0+ c #CEE5FA", +"a+ c #CAE2FA", +"b+ c #C8E2FA", +"c+ c #CAE8FF", +"d+ c #A0BAD1", +"e+ c #1E2021", +"f+ c #2F2E2C", +"g+ c #3E3E3E", +"h+ c #262626", +"i+ c #050505", +"j+ c #9C9C9D", +"k+ c #DFDFDF", +"l+ c #D0D0CF", +"m+ c #93AFCB", +"n+ c #76B3EC", +"o+ c #75B7F2", +"p+ c #74B5F1", +"q+ c #70B3F1", +"r+ c #6CB1F0", +"s+ c #68AEF0", +"t+ c #62ACEF", +"u+ c #60AAEF", +"v+ c #5DA9EF", +"w+ c #DFEDFB", +"x+ c #DDECFB", +"y+ c #D7EAFA", +"z+ c #D3E8FA", +"A+ c #CDE6FB", +"B+ c #C9E1FA", +"C+ c #4D5862", +"D+ c #262422", +"E+ c #4A4A49", +"F+ c #444444", +"G+ c #303030", +"H+ c #0C0C0C", +"I+ c #0B0B0B", +"J+ c #161616", +"K+ c #222222", +"L+ c #959595", +"M+ c #FFFFFF", +"N+ c #FFFEFA", +"O+ c #9CC0E0", +"P+ c #77B7F3", +"Q+ c #79B7F2", +"R+ c #75B5F1", +"S+ c #71B3F1", +"T+ c #6DB1F0", +"U+ c #69AEF0", +"V+ c #65ACEF", +"W+ c #DEEFFB", +"X+ c #D8EAFA", +"Y+ c #D4E8FA", +"Z+ c #D3EAFF", +"`+ c #BAD1E6", +" @ c #30363A", +".@ c #3C3B3A", +"+@ c #505050", +"@@ c #464646", +"#@ c #191919", +"$@ c #1D1D1D", +"%@ c #A0A0A0", +"&@ c #EFEFEF", +"*@ c #FFFEFE", +"=@ c #D7DBDD", +"-@ c #73AEE7", +";@ c #7CBBF6", +">@ c #78B6F4", +",@ c #ECFBFF", +"'@ c #DCECFB", +")@ c #D9EAFA", +"!@ c #D9EFFF", +"~@ c #ACBED2", +"{@ c #262B31", +"]@ c #424142", +"^@ c #555555", +"/@ c #353535", +"(@ c #1B1B1B", +"_@ c #606060", +":@ c #C2C2C2", +"<@ c #FEFEFE", +"[@ c #F3EFEF", +"}@ c #79A8D9", +"|@ c #88C2F4", +"1@ c #7CBAF5", +"2@ c #77B8FA", +"3@ c #76B6F1", +"4@ c #76BCFE", +"5@ c #DFEFFB", +"6@ c #DEEDFD", +"7@ c #CDCD9F", +"8@ c #4D4B30", +"9@ c #373841", +"0@ c #58585A", +"a@ c #3D3D3D", +"b@ c #202020", +"c@ c #232323", +"d@ c #2C2C2C", +"e@ c #8C8C8C", +"f@ c #EBEBEB", +"g@ c #FDFBFF", +"h@ c #B2BC9A", +"i@ c #FFEC23", +"j@ c #BBBA4D", +"k@ c #7ABDFF", +"l@ c #7AB8F1", +"m@ c #DFEFFD", +"n@ c #DCE6EC", +"o@ c #D2BB53", +"p@ c #C5AB1A", +"q@ c #424137", +"r@ c #4E4F59", +"s@ c #3D3D3F", +"t@ c #212121", +"u@ c #0A0A0A", +"v@ c #C5C5C5", +"w@ c #F6F7FF", +"x@ c #BDB348", +"y@ c #E8CC00", +"z@ c #A09532", +"A@ c #7EC0FF", +"B@ c #F0FEFF", +"C@ c #C9C39A", +"D@ c #CFAF25", +"E@ c #D7BD22", +"F@ c #646146", +"G@ c #3B3C44", +"H@ c #2C2D2E", +"I@ c #030303", +"J@ c #383838", +"K@ c #9F9F9F", +"L@ c #828282", +"M@ c #929292", +"N@ c #DEDEDE", +"O@ c #F0F0F0", +"P@ c #FCFCFC", +"Q@ c #D3D5DE", +"R@ c #96833B", +"S@ c #998D48", +"T@ c #8CB5D0", +"U@ c #C6CED3", +"V@ c #99894D", +"W@ c #D2B51F", +"X@ c #C2AF30", +"Y@ c #54533F", +"Z@ c #353640", +"`@ c #2D2D2E", +" # c #242424", +".# c #D7D7D7", +"+# c #CCCCCC", +"@# c #CFCFCF", +"## c #D0D0D0", +"$# c #D5D5D5", +"%# c #E5E5E5", +"&# c #EFEFF0", +"*# c #BDBBB9", +"=# c #877F4A", +"-# c #8FAAB0", +";# c #1B1E23", +"># c #302D28", +",# c #937D25", +"'# c #D8BE23", +")# c #C6B921", +"!# c #454542", +"~# c #282937", +"{# c #141419", +"]# c #1E1E1F", +"^# c #E1E1E1", +"/# c #D2D2D2", +"(# c #D9D9D9", +"_# c #DEDDDE", +":# c #99947E", +"<# c #97B0B0", +"[# c #12141B", +"}# c #463F2B", +"|# c #987F21", +"1# c #EBD319", +"2# c #CEC222", +"3# c #3E3C17", +"4# c #131301", +"5# c #4E4E4F", +"6# c #969696", +"7# c #B5B5B5", +"8# c #C0C0C1", +"9# c #B7B7B9", +"0# c #B7B6B5", +"a# c #9D9E92", +"b# c #97AEB4", +"c# c #000001", +"d# c #141515", +"e# c #726841", +"f# c #A78F1F", +"g# c #D7C20D", +"h# c #D5CA04", +"i# c #CEC402", +"j# c #8C8402", +"k# c #070400", +"l# c #000002", +"m# c #1F1F23", +"n# c #36311E", +"o# c #615F46", +"p# c #92A7AE", +"q# c #B3AD88", +"r# c #7D6A1A", +"s# c #87730D", +"t# c #9C890D", +"u# c #A69A2C", +"v# c #8F9795", +"w# c #8594A6", +"x# c #7E8D99", +"y# c #4D4319", +"z# c #493B03", +"A# c #645001", +"B# c #A2AD9A", +"C# c #EEFFFF", +"D# c #EBFDFF", +"E# c #E6FAFF", +"F# c #E1F8FF", +"G# c #DEF5FF", +"H# c #DCF4FF", +"I# c #DBF5FF", +"J# c #D9F6FF", +"K# c #D4F4FF", +"L# c #CBEEFF", +"M# c #E4F0FC", +"N# c #E2EEFB", +"O# c #D9EBFB", +"P# c #D4E8FB", +"Q# c #D1E6FA", +"R# c #CDE4FA", +"S# c #C8E2F9", +"T# c #F0FDFF", +"U# c #E1EFFB", +"V# c #DEEDFB", +"W# c #D5E9FB", +"X# c #E6F0FC", +"Y# c #E2EFFC", +"Z# c #DEEDFC", +"`# c #DAEBFB", +" $ c #E5F1FC", +".$ c #E2F0FC", +" . . ", +" + @ # $ ", +" % & * = - $ ", +" ; > , ' * = ) $ ", +" ! ~ { ] ^ / ( _ : $ ", +" < [ } | 1 2 3 4 5 6 7 8 ", +" 9 0 a b c d e f g h i j k l ", +" m n o p q r s t u v w x y z : A ", +" B C D E F G H I J K L M N O P Q R S ", +" T U V W X Y Z ` ...+.@.#.$.%.&.*.=.-.;. ", +" >.,.'.).!.~.{.].^./.(._.:.<.[.}.|.1.2.3.4.5. ", +" 6.7.8.9.0.a.b.c.d.` e.f.g.h.i.j.k.l.m.n.o.p.q.r. ", +" s.t.u.7.v.w.x.y.z.A.B.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P. ", +" Q.R.S.T.U.V.W.X.Y.Z.`. +.+++++++++@+#+$+%+&+*+=+-+;+>+,+ ", +" '+)+!+~+{+]+6.^+/+(+_+:+<+++++++++++[+}+|+2 1+2+3+4+' 5+6+,+ ", +"7+8+9+0+a+b+c+d+e+f+Y g+h+i+++++++++ +j+k+l+m+n+o+p+q+r+s+t+u+v+", +"w+x+y+z+)+A+B+C+D+E+F+A.G+H+I+J+++K+L+M+M+M+N+O+P+Q+R+S+T+U+V+u+", +" W+x+X+Y+Z+`+ @.@+@@@g+#@++++$@Y %@&@M+M+*@M+=@-@;@>@1 S+T+U+ ", +" ,@'@)@!@~@{@]@^@@@/@(@I+++++_@:@&@M+M+<@M+[@}@|@1@2@3@4@ ", +" 5@6@5@7@8@9@0@a@b@<+$@c@++++d@e@f@M+<@M+g@h@i@j@k@l@ ", +" m@n@o@p@q@r@s@t@u@H+A.B.++++G+v@M+M+M+w@x@y@z@A@ ", +" B@C@D@E@F@G@H@#@++I@J@K@L@M@N@O@P@<@Q@R@S@T@ ", +" U@V@W@X@Y@Z@`@I+++ #.#+#@###$#%#&#*#=#-# ", +" ;#>#,#'#)#!#~#{#++]#@#^#^#$#/#(#_#:#<# ", +" ++[#}#|#1#2#3#4#++++5#6#7#8#9#0#a#b# ", +" c#d#e#f#g#h#i#j#k#++++l#m#n#o#p# ", +" q#r#s#t#u#v#w#x#y#z#A#B# ", +" C#D#E#F#G#H#I#J#K#L# ", +" M#N#x+O#P#Q#R#S# ", +" T#U#V#O#W#H# ", +" X#Y#Z#`# ", +" $.$ "}; diff --git a/data/supertux.desktop b/data/supertux.desktop new file mode 100644 index 000000000..73a6504d5 --- /dev/null +++ b/data/supertux.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=SuperTux Platform Game +Comment=A Super Mario inspired penguin platform game +Exec=supertux +Terminal=false +Type=Application +Categories=Application;Game;ArcadeGame +Icon=supertux.png + diff --git a/src/setup.cpp b/src/setup.cpp index e124d3743..b891b49d0 100644 --- a/src/setup.cpp +++ b/src/setup.cpp @@ -895,13 +895,13 @@ void seticon(void) /* Load icon into a surface: */ - icon = IMG_Load((datadir + "/images/icon.xpm").c_str()); + icon = IMG_Load((datadir + "/images/supertux.xpm").c_str()); if (icon == NULL) { fprintf(stderr, "\nError: I could not load the icon image: %s%s\n" "The Simple DirectMedia error that occured was:\n" - "%s\n\n", datadir.c_str(), "/images/icon.xpm", SDL_GetError()); + "%s\n\n", datadir.c_str(), "/images/supertux.xpm", SDL_GetError()); exit(1); } diff --git a/src/type.h b/src/type.h index bc6e7c8ba..d9faf125f 100644 --- a/src/type.h +++ b/src/type.h @@ -65,7 +65,8 @@ public: scroll_x = tmp; base = btmp; }; -void move_to(float x, float y) { base.x = x; base.y = y; }; + + void move_to(float x, float y) { base.x = x; base.y = y; }; base_type base; base_type old_base;