Binary files /tmp/AWgy1ZmkHz/bloboats-1.0.1.dsfg/INTRO.png and /tmp/PwsEDik4Nt/bloboats-1.0.2+dfsg/INTRO.png differ diff -Nru bloboats-1.0.1.dsfg/INTRO.txt bloboats-1.0.2+dfsg/INTRO.txt --- bloboats-1.0.1.dsfg/INTRO.txt 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/INTRO.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Bloboats is a boat racing game in the spirit of Elasto Mania or X-Moto, -introducing a handful of elements from Super Mario Bros -like games. \ No newline at end of file diff -Nru bloboats-1.0.1.dsfg/Makefile bloboats-1.0.2+dfsg/Makefile --- bloboats-1.0.1.dsfg/Makefile 2006-09-22 12:27:17.000000000 +0000 +++ bloboats-1.0.2+dfsg/Makefile 2010-11-23 19:27:16.000000000 +0000 @@ -24,12 +24,11 @@ ### To compile, this program requires: -# SDL, SDL_image, SDL_mixer and SDL_net to compile. Libvorbis for music support. +# SDL, SDL_image, SDL_mixer to compile. Libvorbis for music support. # OpenGL support. -SOUND = 0 -NETWORK = 1 -MUSIC = 0 +SOUND = 1 +MUSIC = 1 DEBUG = 0 # Select target system @@ -73,11 +72,11 @@ SDLCONFIG = $(SDLCONFIG_$(TARGET)) ### Libs -LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L/usr/X11R6/lib -lGL -lGLU -LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -L/usr/pkg/lib -LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -framework OpenGL -LIBS_CROSS = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lopengl32 -lglu32 +LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU +LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -L/usr/X11R6/lib -lGL -lGLU +LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -L/usr/pkg/lib +LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -framework OpenGL +LIBS_CROSS = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lopengl32 -lglu32 LIBS = $(LIBS_$(TARGET)) @@ -136,6 +135,7 @@ all: config main main: $(OBJ) + mkdir -p bin $(CXX) $(OBJ) $(LIBS) $(CXXFLAGS) $(STRIP) bin/$(BINARY) @@ -150,7 +150,6 @@ chmod 644 bloboats.dirs echo "#define DEFAULT_CONFIGFILE \"$(CONFIGDIR)/bloboats.dirs\"" >src/compiling_settings.h echo "#define SOUND $(SOUND)" >> src/compiling_settings.h - echo "#define NETWORK $(NETWORK)" >> src/compiling_settings.h echo "#define MUSIC $(MUSIC)" >> src/compiling_settings.h echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h diff -Nru bloboats-1.0.1.dsfg/bloboats.dirs bloboats-1.0.2+dfsg/bloboats.dirs --- bloboats-1.0.1.dsfg/bloboats.dirs 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/bloboats.dirs 2010-08-25 19:58:56.000000000 +0000 @@ -0,0 +1,2 @@ +datadir data +privatedir private \ No newline at end of file diff -Nru bloboats-1.0.1.dsfg/copying.txt bloboats-1.0.2+dfsg/copying.txt --- bloboats-1.0.1.dsfg/copying.txt 2006-08-02 23:05:37.000000000 +0000 +++ bloboats-1.0.2+dfsg/copying.txt 2010-11-23 18:42:36.000000000 +0000 @@ -1,12 +1,13 @@ - Bloboats version 1.0.1 - Copyright (C) 2006 Markus Kettunen - - This license holds for the program itself: the source code - and the data files except some of the sounds files which are - licensed under Sampling Plus 1.0 license. - (http://creativecommons.org/licenses/sampling+/1.0/) - + Bloboats version 1.0.2 + Copyright (C) 2006, 2010 Markus Kettunen + All .wav files in the project are under license + Creative Commons Sampling Plus 1.0 which is available at + http://creativecommons.org/licenses/sampling+/1.0/. + + For Bloboats source code and Bloboats data, the following holds: + + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or diff -Nru bloboats-1.0.1.dsfg/debian/README.Debian bloboats-1.0.2+dfsg/debian/README.Debian --- bloboats-1.0.1.dsfg/debian/README.Debian 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/README.Debian 2013-05-21 15:27:47.000000000 +0000 @@ -1,6 +1,6 @@ -= Bloboats 1.0.1.dsfg-1 = += Bloboats 1.0.2+dsfg = -Audio files had been remove from the original tarball. We did this because +Audio files had been removed from the original tarball. We did this because they failed §6 DFSG. http://lists.alioth.debian.org/pipermail/pkg-games-devel/2006-September/001914.html diff -Nru bloboats-1.0.1.dsfg/debian/bloboats.6 bloboats-1.0.2+dfsg/debian/bloboats.6 --- bloboats-1.0.1.dsfg/debian/bloboats.6 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/bloboats.6 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1,25 @@ +.\" This man page was written by Markus Koschany in May 2013 with the help of help2man. +.TH BLOBOATS "6" "May 2013" "Bloboats version 1.0.2" "User Commands" +.SH NAME +Bloboats \- a boat racing game + +.SH DESCRIPTION +Bloboats is a boat game in the spirit of Elasto Mania or X-Moto, +introducing a handful of elements from Super Mario Bros \-like games. + +.SH "OPTIONS" +.SS "Possible flags:" +.HP +\fB\-\-nosound\fR disables sounds +.HP +\fB\-\-sound\fR enables sounds +.HP +\fB\-\-windowed\fR or \fB\-w\fR enables windowed mode +.HP +\fB\-\-fullscreen\fR or \fB\-f\fR enables fullscreen mode +.HP +\fB\-\-resolution\fR=\fINxM\fR changes resolution to NxM +.HP +\fB\-\-nolimit\fR disables some speed limitations +.HP +\fB\-\-help\fR prints this help diff -Nru bloboats-1.0.1.dsfg/debian/bloboats.desktop bloboats-1.0.2+dfsg/debian/bloboats.desktop --- bloboats-1.0.1.dsfg/debian/bloboats.desktop 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/bloboats.desktop 2013-05-21 15:27:47.000000000 +0000 @@ -1,9 +1,11 @@ [Desktop Entry] Name=Bloboats Comment=An arcade-like boat racing game +Comment[de]=Ein Bootrennen im Arkade-Stil Exec=bloboats Icon=bloboats Terminal=false Type=Application Categories=Game;ArcadeGame; StartupNotify=false +Keywords=boat;race;water;arcade;jump;game; diff -Nru bloboats-1.0.1.dsfg/debian/bloboats.sgml bloboats-1.0.2+dfsg/debian/bloboats.sgml --- bloboats-1.0.1.dsfg/debian/bloboats.sgml 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/bloboats.sgml 1970-01-01 00:00:00.000000000 +0000 @@ -1,119 +0,0 @@ - manpage.1'. You may view - the manual page with: `docbook-to-man manpage.sgml | nroff -man | - less'. A typical entry in a Makefile or Makefile.am is: - -manpage.1: manpage.sgml - docbook-to-man $< > $@ - - - The docbook-to-man binary is found in the docbook-to-man package. - Please remember that if you create the nroff version in one of the - debian/rules file targets (such as build), you will need to include - docbook-to-man in your Build-Depends control field. - - --> - - - Goneri"> - Le Bouder"> - - aug 19, 2006"> - - 6"> - goneri@rulezlan.org"> - - BLOBOATS"> - - - Debian"> - GNU"> - GPL"> -]> - - - -
- &dhemail; -
- - &dhfirstname; - &dhsurname; - - - 2006 - &dhusername; - - &dhdate; - - - &dhucpackage; - - &dhsection; - - - &dhpackage; - - A Boat racing game - - Bloboats is a boat game in the spirit of Elasto Mania or X-Moto, - introducing a handful of elements from Super Mario Bros -like games. - - - - DESCRIPTION - - This manual page documents briefly the - &dhpackage;. - - - This manual page was written for the &debian; distribution - because the original program does not have a manual page. - . - - - - - OPTIONS - - These programs don't have specific option. - - - - AUTHOR - - This manual page was written by &dhusername; &dhemail; for - the &debian; system (but may be used by others). Permission is - granted to copy, distribute and/or modify this document under - the terms of the &gnu; General Public License, Version 2 any - later version published by the Free Software Foundation. - - - On Debian systems, the complete text of the GNU General Public - License can be found in /usr/share/common-licenses/GPL. - - - - - - - - diff -Nru bloboats-1.0.1.dsfg/debian/bloboats.xpm bloboats-1.0.2+dfsg/debian/bloboats.xpm --- bloboats-1.0.1.dsfg/debian/bloboats.xpm 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/bloboats.xpm 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -/* XPM */ -static char * bloboats_xpm[] = { -"32 32 306 2", -" c None", -". c #918F8F", -"+ c #9F9ED0", -"@ c #B4B4FF", -"# c #9A99BC", -"$ c #9D9A99", -"% c #9A9796", -"& c #A19E9C", -"* c #908EA7", -"= c #B4B5FF", -"- c #AFB0F7", -"; c #9999CA", -"> c #9393BB", -", c #A0A1D3", -"' c #9C9DC5", -") c #9A9BCD", -"! c #9593AD", -"~ c #B6B3FF", -"{ c #B6B4FF", -"] c #9593BD", -"^ c #A09C99", -"/ c #9C9998", -"( c #A29E9C", -"_ c #9997BE", -": c #B6B5FF", -"< c #B1B0F8", -"[ c #8A89B7", -"} c #9E9DDB", -"| c #9493C2", -"1 c #9897C8", -"2 c #AAAAEF", -"3 c #A19ED3", -"4 c #B7B2FF", -"5 c #B7B3FF", -"6 c #9895C5", -"7 c #9E9A99", -"8 c #9F9C9B", -"9 c #A8A5DC", -"0 c #B7B4FF", -"a c #ABA9EF", -"b c #B6AFFB", -"c c #B8B1FF", -"d c #B8B2FF", -"e c #A49FD5", -"f c #A19E9D", -"g c #9E9B9A", -"h c #939091", -"i c #B2ADF3", -"j c #B8B3FF", -"k c #ACA8EF", -"l c #B9B0FF", -"m c #B9B1FF", -"n c #A39DD4", -"o c #979493", -"p c #8D8A8F", -"q c #8E8AA2", -"r c #B8B1FD", -"s c #B9B2FF", -"t c #AEA7EF", -"u c #BAAFFF", -"v c #BAB0FF", -"w c #B3AAEF", -"x c #ADA4E4", -"y c #B6ADF5", -"z c #BAB1FF", -"A c #AFA6EF", -"B c #BBAFFF", -"C c #BBB0FF", -"D c #BBB1FF", -"E c #AFA5EF", -"F c #BDAEFF", -"G c #BDAFFF", -"H c #BDB0FF", -"I c #B1A4EF", -"J c #BEADFF", -"K c #BEAEFF", -"L c #BEAFFF", -"M c #B2A3EF", -"N c #BFACFF", -"O c #BFADFF", -"P c #8B7FAC", -"Q c #9689BF", -"R c #BFAEFF", -"S c #B3A2EF", -"T c #C0ABFF", -"U c #C0ACFF", -"V c #C0ADFF", -"W c #AF9EE3", -"X c #614756", -"Y c #604C5F", -"Z c #BBA9F7", -"` c #B4A1EF", -" . c #C1ABFF", -".. c #C1ACFF", -"+. c #C1ABFE", -"@. c #C0AAFD", -"#. c #C1ACFE", -"$. c #B5A1EF", -"%. c #C2AAFF", -"&. c #C2ABFF", -"*. c #B6A0EF", -"=. c #C4A9FF", -"-. c #C4AAFF", -";. c #C2A9FD", -">. c #B79FEF", -",. c #C5A8FF", -"'. c #C5A9FF", -"). c #AEA2F5", -"!. c #B6A5F9", -"~. c #9A8AB7", -"{. c #8F8B90", -"]. c #8C888F", -"^. c #898392", -"/. c #C2A7FB", -"(. c #B89EEF", -"_. c #C6A7FF", -":. c #C6A8FF", -"<. c #90AFE4", -"[. c #B4BCF9", -"}. c #C0B0FC", -"|. c #A293BC", -"1. c #9E9997", -"2. c #A19D9B", -"3. c #948F92", -"4. c #C2A6F8", -"5. c #B99DEF", -"6. c #C7A7FF", -"7. c #BACBFD", -"8. c #B9CFFD", -"9. c #C6AAFF", -"0. c #A495BB", -"a. c #A09D9C", -"b. c #918F8E", -"c. c #BFA2F2", -"d. c #C7A8FF", -"e. c #C5A6FF", -"f. c #C4A5FF", -"g. c #C2A4FF", -"h. c #BA9EFF", -"i. c #AC93F2", -"j. c #C8A6FF", -"k. c #C8A7FF", -"l. c #9B8FAA", -"m. c #A2A09E", -"n. c #9E9B9B", -"o. c #949190", -"p. c #C0A1F3", -"q. c #C7A6FD", -"r. c #C5A5FE", -"s. c #BEA0FF", -"t. c #AA92FF", -"u. c #9B89FF", -"v. c #8F80FF", -"w. c #8177FF", -"x. c #7972FF", -"y. c #7770FC", -"z. c #C9A5FF", -"A. c #C9A6FF", -"B. c #9C92A6", -"C. c #A39E9D", -"D. c #959291", -"E. c #BE9FEC", -"F. c #C1A0FF", -"G. c #AB93FF", -"H. c #7283D2", -"I. c #737AE8", -"J. c #CAA4FF", -"K. c #CAA5FF", -"L. c #988EA2", -"M. c #A09C9B", -"N. c #999694", -"O. c #9A89DF", -"P. c #8B7DFF", -"Q. c #7C73FF", -"R. c #7772FC", -"S. c #5272CD", -"T. c #5771D3", -"U. c #7872FE", -"V. c #CCA3FF", -"W. c #CCA4FF", -"X. c #CBA4FF", -"Y. c #BE9CFF", -"Z. c #928B9A", -"`. c #9A9795", -" + c #9D9998", -".+ c #7872D2", -"++ c #7A72FF", -"@+ c #7872FD", -"#+ c #5670D1", -"$+ c #556FD0", -"%+ c #7672FA", -"&+ c #BA98FF", -"*+ c #C49EFF", -"=+ c #CBA2FF", -"-+ c #CDA3FF", -";+ c #C9A1FF", -">+ c #C09CFF", -",+ c #B997FF", -"'+ c #B495FF", -")+ c #A189FF", -"!+ c #9683FF", -"~+ c #8478FF", -"{+ c #7C73FE", -"]+ c #878488", -"^+ c #A09C9A", -"/+ c #9B9897", -"(+ c #7770D0", -"_+ c #7A71FF", -":+ c #5F72DD", -"<+ c #5873D5", -"[+ c #7072F2", -"}+ c #776FFC", -"|+ c #7E73FF", -"1+ c #8075FF", -"2+ c #8175FF", -"3+ c #7F74FF", -"4+ c #7A71FE", -"5+ c #8F8D8C", -"6+ c #9E9A98", -"7+ c #A39F9E", -"8+ c #756FC8", -"9+ c #6E72F0", -"0+ c #6A72EB", -"a+ c #7172F4", -"b+ c #7A71FC", -"c+ c #8D8B8C", -"d+ c #9E9B99", -"e+ c #807AC4", -"f+ c #7271F5", -"g+ c #7171F4", -"h+ c #7971FE", -"i+ c #7B71FF", -"j+ c #7A71EA", -"k+ c #93908F", -"l+ c #A29F9D", -"m+ c #9D9A9A", -"n+ c #9C9997", -"o+ c #7D77B5", -"p+ c #786FFC", -"q+ c #7B73DE", -"r+ c #9F9C9A", -"s+ c #A49F9E", -"t+ c #9D9997", -"u+ c #8680BD", -"v+ c #736BD6", -"w+ c #9C9A98", -"x+ c #8580B8", -"y+ c #7B70FF", -"z+ c #786EFC", -"A+ c #7870D2", -"B+ c #7E79A1", -"C+ c #7C70FF", -"D+ c #796FF0", -"E+ c #7B76A5", -"F+ c #9D9A98", -"G+ c #A29E9D", -"H+ c #817D94", -"I+ c #7C73E5", -"J+ c #7A70E3", -"K+ c #786EE1", -"L+ c #796FE2", -"M+ c #7B72E4", -"N+ c #776DE0", -"O+ c #7C72E5", -"P+ c #796FE1", -"Q+ c #776EDF", -"R+ c #7B70F1", -"S+ c #7F78BC", -"T+ c #828089", -"U+ c #999696", -"V+ c #989595", -"W+ c #9F9B9A", -"X+ c #A19D9C", -"Y+ c #8D8A8A", -"Z+ c #8A8887", -"`+ c #908E8D", -" @ c #8E8C8B", -".@ c #908D8C", -"+@ c #918E8D", -"@@ c #949191", -"#@ c #928F8E", -"$@ c #8F8D8D", -"%@ c #92908F", -"&@ c #949291", -"*@ c #796EEF", -"=@ c #7670B2", -"-@ c #8E8C94", -";@ c #999695", -">@ c #9B9796", -",@ c #A09E9D", -"'@ c #9B9898", -")@ c #989593", -"!@ c #9E9C9A", -"~@ c #9F9D9C", -"{@ c #9C9999", -"]@ c #786DFB", -"^@ c #7B70F0", -"/@ c #7D77B9", -"(@ c #868287", -"_@ c #9A9695", -":@ c #A39F9D", -"<@ c #9E9C9B", -"[@ c #9C9896", -"}@ c #9B9896", -"|@ c #A09B9A", -"1@ c #9B9795", -". + @ @ @ @ @ @ @ @ @ @ @ # $ % & * = = = = = = = = - ; > , ' ) ", -"! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ { { ] ^ / ( _ { { { { { { : : < [ } | 1 2 ", -"3 4 4 4 4 4 4 4 5 5 5 5 5 6 7 8 $ 9 5 5 5 0 0 0 0 0 0 0 0 0 0 a ", -"b c c c c c d d d d d d d e f g h i j j j j j j j j j j j j j k ", -"l l l l l m m m m m m m m n o p q r s s s s s s s s s s s s s t ", -"u u u v v v v v v v v v v w x y z z z z z z z z z z z z z z z A ", -"B B B B B B B B B B B B C C C C C C C C C C C C C D C C C C C E ", -"F F F F F F F F F F G G G G G G G G G G G G H H H H H G G G G I ", -"J J J J J J J K K K K K K K K K K K K L L L L L L L L L K K K M ", -"N N N N O O O O O O O O O O O O P Q R R R R R R R R R R O O O S ", -"T U U U U U U U U U U U U U V W X Y Z V V V V V V V V V V U U ` ", -" . . . . . . . . . . .........+.@.#......................... .$.", -"%.%.%.%.%.%.%.%.%.%.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.%.%.%.*.", -"=.=.=.=.=.=.=.=.-.-.-.-.-.;.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.=.=.>.", -",.,.,.,.,.'.'.'.'.'.).!.'.~.{.].^./.'.'.'.'.'.'.'.'.'.'.'.'.,.(.", -"_._.:.:.:.:.:.:.:.:.<.[.}.|.1.2.3.4.:.:.:.:.:.:.:.:.:.:.:.:.:.5.", -"6.6.6.6.6.6.6.6.6.6.7.8.9.0.a.7 b.c.d.6.6.6.6.6.6.6.6.e.f.g.h.i.", -"j.j.j.j.j.j.j.j.j.k.k.k.k.l.m.n.o.p.k.k.j.q.r.s.t.u.v.w.x.x.x.y.", -"z.z.z.z.z.z.A.A.A.A.A.A.A.B.C.7 D.E.z.F.G.H.I.x.x.x.x.x.x.x.x.y.", -"J.J.J.K.K.K.K.K.K.K.K.K.K.L.M.% N.O.P.Q.R.S.T.U.x.x.x.x.x.x.x.y.", -"V.V.V.W.W.W.W.W.W.W.W.X.Y.Z.$ `. +.+++++@+#+$+%+++++++++++++++y.", -"&+*+=+-+-+;+>+,+'+)+!+~+{+]+^+/+M.(+++++_+:+<+[+_+_+_+_+_+_+_+}+", -"_+|+1+2+2+3+Q._+_+_+_+_+4+5+6+M.7+8+_+_+_+9+0+a+_+_+_+_+_+_+_+}+", -"_+_+_+_+_+_+_+_+_+_+_+_+b+c+f d+$ e+_+_+_+f+g+h+_+_+_+_+_+_+_+}+", -"i+i+i+i+i+i+i+i+i+i+i+i+j+k+l+m+n+o+i+i+i+i+i+i+i+i+i+i+i+i+i+p+", -"i+i+i+i+i+i+i+i+i+i+i+i+q+r+s+7 t+u+i+i+i+i+i+i+i+i+i+i+i+i+i+p+", -"i+i+i+i+i+i+i+i+i+i+i+i+v+w+$ N.f x+i+i+i+i+i+i+i+y+y+y+y+y+y+z+", -"i+i+i+i+i+i+i+i+i+i+i+i+A+$ d+% l+B+y+y+y+y+y+y+y+y+y+y+y+y+y+z+", -"C+C+C+C+C+C+C+C+C+C+C+D+E+/+^ F+G+H+I+J+K+K+L+M+N+K+L+O+L+K+P+Q+", -"C+C+C+C+C+C+C+C+C+R+S+T+U+V+g W+X+o Y+Z+Z+`+ @o..@+@@@#@$@%@&@%@", -"C+C+C+C+C+C+C+*@=@-@g /+$ ;@& g m+>@8 ,@/ $ '@X+8 $ )@!@~@/ 7 {@", -"]@]@]@]@]@^@/@(@_@a.a.% M./ :@<@[@n+f M.}@|@/ G+n.1@g X+X+/+6+$ "}; diff -Nru bloboats-1.0.1.dsfg/debian/changelog bloboats-1.0.2+dfsg/debian/changelog --- bloboats-1.0.1.dsfg/debian/changelog 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/changelog 2013-05-31 10:25:35.000000000 +0000 @@ -1,3 +1,45 @@ +bloboats (1.0.2+dfsg-1) unstable; urgency=low + + * Team upload. + + [ Mahyuddin Susanto ] + * New upstream release. + * Refreshed all patches: + - debian/patches/01-fix_segfault_notebook.patch + - debian/patches/02-fix-Makefile.patch + - debian/patches/03-uint32.patch + * Update copyright to copyright format 1.0. + * Simplify debian/rules by using dh sequencer. + * Switch to source format 3.0 (quilt). + + [ Gonéri Le Bouder ] + * Remove myself from Uploaders. + + [ Markus Koschany ] + * Bump compatibility level to 9 and require debhelper >=9. + * Bump Standards-Version to 3.9.4, no changes needed. + * Rename the debian package version to 1.0.2+dfsg. (Closes: #593517) + * The new upstream version supports higher screen resolutions, at least + 1680x1050 pixel. (Closes: #560101) + * The new upstream version seemingly fixes the bug that HV-Arena finishes + before the player can reach the Enterprise. (Closes: #413819) + * Update debian/watch and make the file extension regex more flexible. + * debian/rules: + - Build with --parallel. + - Drop unneeded overrides and further simplify debian/rules. + * debian/patches: + - Add DEP-3 header to 02-fix-Makefile.patch + - Add Hardening.patch to enable $(LDFLAGS). + * Convert bloboats.sgml to bloboats.6. Add missing OPTIONS. + * Install readme.txt via docs file and bloboats.6 with manpages file. + * Add new high resolution bloboats.png icon. + * debian/control: + - Drop docbook-to-man and libglib2.0-dev from Build-Depends. Both are not + needed. + * bloaboats.desktop: Add comment in German and keywords. + + -- Markus Koschany Fri, 31 May 2013 12:24:27 +0200 + bloboats (1.0.1.dsfg-3) unstable; urgency=low [ Paul Wise ] diff -Nru bloboats-1.0.1.dsfg/debian/compat bloboats-1.0.2+dfsg/debian/compat --- bloboats-1.0.1.dsfg/debian/compat 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/compat 2013-05-21 15:27:47.000000000 +0000 @@ -1 +1 @@ -5 +9 diff -Nru bloboats-1.0.1.dsfg/debian/control bloboats-1.0.2+dfsg/debian/control --- bloboats-1.0.1.dsfg/debian/control 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/control 2013-05-31 10:28:04.000000000 +0000 @@ -2,24 +2,28 @@ Section: games Priority: optional Maintainer: Debian Games Team -Uploaders: Gonéri Le Bouder , Barry deFreese -Build-Depends: debhelper (>= 5.0.0), libglib2.0-dev, libsdl-image1.2-dev, libsdl-net1.2-dev, quilt, docbook-to-man -Standards-Version: 3.8.1 +Uploaders: + Barry deFreese , +Build-Depends: + debhelper (>= 9), + libsdl-image1.2-dev, + libsdl-net1.2-dev +Standards-Version: 3.9.4 Homepage: http://bloboats.blobtrox.net/about.php -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/bloboats/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/bloboats/?op=log +Vcs-Git: git://anonscm.debian.org/pkg-games/bloboats.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-games/bloboats.git Package: bloboats Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: a boat racing game - Bloboats is an arcade-like boat racing game in the hybrid spirit of +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Boat racing game + Bloboats is an arcade-like boat racing game in the hybrid spirit of Mario-like platform jumpers and elasto mania / xmoto. - . + . The objective of Bloboats is to reach MS Enterprise as fast as possible to - save if from the hands of the terrible Tentacle Monsters of an Unknown Master - and the same time beat your friend and laugh at his or her puny time. - . + save it from the hands of the terrible Tentacle Monsters of an Unknown Master + and in the same time beat your friend and laugh at his or her puny time. + . The journey starts from a place called Tutorial, somewhere in the United States, and somehow the player ends up in the famous HV-Arena of Helsinki. During the trip a number of MS Enterprises are saved, luckily, from the diff -Nru bloboats-1.0.1.dsfg/debian/copyright bloboats-1.0.2+dfsg/debian/copyright --- bloboats-1.0.1.dsfg/debian/copyright 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/copyright 2013-05-21 15:27:47.000000000 +0000 @@ -1,24 +1,35 @@ -This package was debianized by Gonéri Le Bouder on -Sun, 20 Aug 2006 21:33:20 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: bloboats +Upstream-Contact: Markus Kettunen +Source: http://bloboats.dy.fi/ + +Files: * +Copyright: 2006,2010, Markus Kettunen +License: GPL-2+ + +Files: debian/* +Copyright: 2006-2009, Gonéri Le Bouder + 2007-2008, Jon Dowland + 2008, Ansgar Burchardt, William Lima + 2008, Barry deFreese + 2009, Paul Wise + 2012, Mahyuddin Susanto + 2013, Markus Koschany +License: GPL-2+ - Copyright (C) 2006 Markus Kettunen - - This license holds for the program itself: the source code - and the data files except some of the sounds files. - - This program is free software; you can redistribute it and/or modify +License: GPL-2+ + This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, + . + This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -On Debian systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -Nru bloboats-1.0.1.dsfg/debian/docs bloboats-1.0.2+dfsg/debian/docs --- bloboats-1.0.1.dsfg/debian/docs 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/docs 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1 @@ +readme.txt Binary files /tmp/AWgy1ZmkHz/bloboats-1.0.1.dsfg/debian/icons/bloboats.png and /tmp/PwsEDik4Nt/bloboats-1.0.2+dfsg/debian/icons/bloboats.png differ diff -Nru bloboats-1.0.1.dsfg/debian/icons/bloboats.xpm bloboats-1.0.2+dfsg/debian/icons/bloboats.xpm --- bloboats-1.0.1.dsfg/debian/icons/bloboats.xpm 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/icons/bloboats.xpm 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1,341 @@ +/* XPM */ +static char * bloboats_xpm[] = { +"32 32 306 2", +" c None", +". c #918F8F", +"+ c #9F9ED0", +"@ c #B4B4FF", +"# c #9A99BC", +"$ c #9D9A99", +"% c #9A9796", +"& c #A19E9C", +"* c #908EA7", +"= c #B4B5FF", +"- c #AFB0F7", +"; c #9999CA", +"> c #9393BB", +", c #A0A1D3", +"' c #9C9DC5", +") c #9A9BCD", +"! c #9593AD", +"~ c #B6B3FF", +"{ c #B6B4FF", +"] c #9593BD", +"^ c #A09C99", +"/ c #9C9998", +"( c #A29E9C", +"_ c #9997BE", +": c #B6B5FF", +"< c #B1B0F8", +"[ c #8A89B7", +"} c #9E9DDB", +"| c #9493C2", +"1 c #9897C8", +"2 c #AAAAEF", +"3 c #A19ED3", +"4 c #B7B2FF", +"5 c #B7B3FF", +"6 c #9895C5", +"7 c #9E9A99", +"8 c #9F9C9B", +"9 c #A8A5DC", +"0 c #B7B4FF", +"a c #ABA9EF", +"b c #B6AFFB", +"c c #B8B1FF", +"d c #B8B2FF", +"e c #A49FD5", +"f c #A19E9D", +"g c #9E9B9A", +"h c #939091", +"i c #B2ADF3", +"j c #B8B3FF", +"k c #ACA8EF", +"l c #B9B0FF", +"m c #B9B1FF", +"n c #A39DD4", +"o c #979493", +"p c #8D8A8F", +"q c #8E8AA2", +"r c #B8B1FD", +"s c #B9B2FF", +"t c #AEA7EF", +"u c #BAAFFF", +"v c #BAB0FF", +"w c #B3AAEF", +"x c #ADA4E4", +"y c #B6ADF5", +"z c #BAB1FF", +"A c #AFA6EF", +"B c #BBAFFF", +"C c #BBB0FF", +"D c #BBB1FF", +"E c #AFA5EF", +"F c #BDAEFF", +"G c #BDAFFF", +"H c #BDB0FF", +"I c #B1A4EF", +"J c #BEADFF", +"K c #BEAEFF", +"L c #BEAFFF", +"M c #B2A3EF", +"N c #BFACFF", +"O c #BFADFF", +"P c #8B7FAC", +"Q c #9689BF", +"R c #BFAEFF", +"S c #B3A2EF", +"T c #C0ABFF", +"U c #C0ACFF", +"V c #C0ADFF", +"W c #AF9EE3", +"X c #614756", +"Y c #604C5F", +"Z c #BBA9F7", +"` c #B4A1EF", +" . c #C1ABFF", +".. c #C1ACFF", +"+. c #C1ABFE", +"@. c #C0AAFD", +"#. c #C1ACFE", +"$. c #B5A1EF", +"%. c #C2AAFF", +"&. c #C2ABFF", +"*. c #B6A0EF", +"=. c #C4A9FF", +"-. c #C4AAFF", +";. c #C2A9FD", +">. c #B79FEF", +",. c #C5A8FF", +"'. c #C5A9FF", +"). c #AEA2F5", +"!. c #B6A5F9", +"~. c #9A8AB7", +"{. c #8F8B90", +"]. c #8C888F", +"^. c #898392", +"/. c #C2A7FB", +"(. c #B89EEF", +"_. c #C6A7FF", +":. c #C6A8FF", +"<. c #90AFE4", +"[. c #B4BCF9", +"}. c #C0B0FC", +"|. c #A293BC", +"1. c #9E9997", +"2. c #A19D9B", +"3. c #948F92", +"4. c #C2A6F8", +"5. c #B99DEF", +"6. c #C7A7FF", +"7. c #BACBFD", +"8. c #B9CFFD", +"9. c #C6AAFF", +"0. c #A495BB", +"a. c #A09D9C", +"b. c #918F8E", +"c. c #BFA2F2", +"d. c #C7A8FF", +"e. c #C5A6FF", +"f. c #C4A5FF", +"g. c #C2A4FF", +"h. c #BA9EFF", +"i. c #AC93F2", +"j. c #C8A6FF", +"k. c #C8A7FF", +"l. c #9B8FAA", +"m. c #A2A09E", +"n. c #9E9B9B", +"o. c #949190", +"p. c #C0A1F3", +"q. c #C7A6FD", +"r. c #C5A5FE", +"s. c #BEA0FF", +"t. c #AA92FF", +"u. c #9B89FF", +"v. c #8F80FF", +"w. c #8177FF", +"x. c #7972FF", +"y. c #7770FC", +"z. c #C9A5FF", +"A. c #C9A6FF", +"B. c #9C92A6", +"C. c #A39E9D", +"D. c #959291", +"E. c #BE9FEC", +"F. c #C1A0FF", +"G. c #AB93FF", +"H. c #7283D2", +"I. c #737AE8", +"J. c #CAA4FF", +"K. c #CAA5FF", +"L. c #988EA2", +"M. c #A09C9B", +"N. c #999694", +"O. c #9A89DF", +"P. c #8B7DFF", +"Q. c #7C73FF", +"R. c #7772FC", +"S. c #5272CD", +"T. c #5771D3", +"U. c #7872FE", +"V. c #CCA3FF", +"W. c #CCA4FF", +"X. c #CBA4FF", +"Y. c #BE9CFF", +"Z. c #928B9A", +"`. c #9A9795", +" + c #9D9998", +".+ c #7872D2", +"++ c #7A72FF", +"@+ c #7872FD", +"#+ c #5670D1", +"$+ c #556FD0", +"%+ c #7672FA", +"&+ c #BA98FF", +"*+ c #C49EFF", +"=+ c #CBA2FF", +"-+ c #CDA3FF", +";+ c #C9A1FF", +">+ c #C09CFF", +",+ c #B997FF", +"'+ c #B495FF", +")+ c #A189FF", +"!+ c #9683FF", +"~+ c #8478FF", +"{+ c #7C73FE", +"]+ c #878488", +"^+ c #A09C9A", +"/+ c #9B9897", +"(+ c #7770D0", +"_+ c #7A71FF", +":+ c #5F72DD", +"<+ c #5873D5", +"[+ c #7072F2", +"}+ c #776FFC", +"|+ c #7E73FF", +"1+ c #8075FF", +"2+ c #8175FF", +"3+ c #7F74FF", +"4+ c #7A71FE", +"5+ c #8F8D8C", +"6+ c #9E9A98", +"7+ c #A39F9E", +"8+ c #756FC8", +"9+ c #6E72F0", +"0+ c #6A72EB", +"a+ c #7172F4", +"b+ c #7A71FC", +"c+ c #8D8B8C", +"d+ c #9E9B99", +"e+ c #807AC4", +"f+ c #7271F5", +"g+ c #7171F4", +"h+ c #7971FE", +"i+ c #7B71FF", +"j+ c #7A71EA", +"k+ c #93908F", +"l+ c #A29F9D", +"m+ c #9D9A9A", +"n+ c #9C9997", +"o+ c #7D77B5", +"p+ c #786FFC", +"q+ c #7B73DE", +"r+ c #9F9C9A", +"s+ c #A49F9E", +"t+ c #9D9997", +"u+ c #8680BD", +"v+ c #736BD6", +"w+ c #9C9A98", +"x+ c #8580B8", +"y+ c #7B70FF", +"z+ c #786EFC", +"A+ c #7870D2", +"B+ c #7E79A1", +"C+ c #7C70FF", +"D+ c #796FF0", +"E+ c #7B76A5", +"F+ c #9D9A98", +"G+ c #A29E9D", +"H+ c #817D94", +"I+ c #7C73E5", +"J+ c #7A70E3", +"K+ c #786EE1", +"L+ c #796FE2", +"M+ c #7B72E4", +"N+ c #776DE0", +"O+ c #7C72E5", +"P+ c #796FE1", +"Q+ c #776EDF", +"R+ c #7B70F1", +"S+ c #7F78BC", +"T+ c #828089", +"U+ c #999696", +"V+ c #989595", +"W+ c #9F9B9A", +"X+ c #A19D9C", +"Y+ c #8D8A8A", +"Z+ c #8A8887", +"`+ c #908E8D", +" @ c #8E8C8B", +".@ c #908D8C", +"+@ c #918E8D", +"@@ c #949191", +"#@ c #928F8E", +"$@ c #8F8D8D", +"%@ c #92908F", +"&@ c #949291", +"*@ c #796EEF", +"=@ c #7670B2", +"-@ c #8E8C94", +";@ c #999695", +">@ c #9B9796", +",@ c #A09E9D", +"'@ c #9B9898", +")@ c #989593", +"!@ c #9E9C9A", +"~@ c #9F9D9C", +"{@ c #9C9999", +"]@ c #786DFB", +"^@ c #7B70F0", +"/@ c #7D77B9", +"(@ c #868287", +"_@ c #9A9695", +":@ c #A39F9D", +"<@ c #9E9C9B", +"[@ c #9C9896", +"}@ c #9B9896", +"|@ c #A09B9A", +"1@ c #9B9795", +". + @ @ @ @ @ @ @ @ @ @ @ # $ % & * = = = = = = = = - ; > , ' ) ", +"! ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ { { ] ^ / ( _ { { { { { { : : < [ } | 1 2 ", +"3 4 4 4 4 4 4 4 5 5 5 5 5 6 7 8 $ 9 5 5 5 0 0 0 0 0 0 0 0 0 0 a ", +"b c c c c c d d d d d d d e f g h i j j j j j j j j j j j j j k ", +"l l l l l m m m m m m m m n o p q r s s s s s s s s s s s s s t ", +"u u u v v v v v v v v v v w x y z z z z z z z z z z z z z z z A ", +"B B B B B B B B B B B B C C C C C C C C C C C C C D C C C C C E ", +"F F F F F F F F F F G G G G G G G G G G G G H H H H H G G G G I ", +"J J J J J J J K K K K K K K K K K K K L L L L L L L L L K K K M ", +"N N N N O O O O O O O O O O O O P Q R R R R R R R R R R O O O S ", +"T U U U U U U U U U U U U U V W X Y Z V V V V V V V V V V U U ` ", +" . . . . . . . . . . .........+.@.#......................... .$.", +"%.%.%.%.%.%.%.%.%.%.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.%.%.%.*.", +"=.=.=.=.=.=.=.=.-.-.-.-.-.;.-.-.-.-.-.-.-.-.-.-.-.-.-.-.-.=.=.>.", +",.,.,.,.,.'.'.'.'.'.).!.'.~.{.].^./.'.'.'.'.'.'.'.'.'.'.'.'.,.(.", +"_._.:.:.:.:.:.:.:.:.<.[.}.|.1.2.3.4.:.:.:.:.:.:.:.:.:.:.:.:.:.5.", +"6.6.6.6.6.6.6.6.6.6.7.8.9.0.a.7 b.c.d.6.6.6.6.6.6.6.6.e.f.g.h.i.", +"j.j.j.j.j.j.j.j.j.k.k.k.k.l.m.n.o.p.k.k.j.q.r.s.t.u.v.w.x.x.x.y.", +"z.z.z.z.z.z.A.A.A.A.A.A.A.B.C.7 D.E.z.F.G.H.I.x.x.x.x.x.x.x.x.y.", +"J.J.J.K.K.K.K.K.K.K.K.K.K.L.M.% N.O.P.Q.R.S.T.U.x.x.x.x.x.x.x.y.", +"V.V.V.W.W.W.W.W.W.W.W.X.Y.Z.$ `. +.+++++@+#+$+%+++++++++++++++y.", +"&+*+=+-+-+;+>+,+'+)+!+~+{+]+^+/+M.(+++++_+:+<+[+_+_+_+_+_+_+_+}+", +"_+|+1+2+2+3+Q._+_+_+_+_+4+5+6+M.7+8+_+_+_+9+0+a+_+_+_+_+_+_+_+}+", +"_+_+_+_+_+_+_+_+_+_+_+_+b+c+f d+$ e+_+_+_+f+g+h+_+_+_+_+_+_+_+}+", +"i+i+i+i+i+i+i+i+i+i+i+i+j+k+l+m+n+o+i+i+i+i+i+i+i+i+i+i+i+i+i+p+", +"i+i+i+i+i+i+i+i+i+i+i+i+q+r+s+7 t+u+i+i+i+i+i+i+i+i+i+i+i+i+i+p+", +"i+i+i+i+i+i+i+i+i+i+i+i+v+w+$ N.f x+i+i+i+i+i+i+i+y+y+y+y+y+y+z+", +"i+i+i+i+i+i+i+i+i+i+i+i+A+$ d+% l+B+y+y+y+y+y+y+y+y+y+y+y+y+y+z+", +"C+C+C+C+C+C+C+C+C+C+C+D+E+/+^ F+G+H+I+J+K+K+L+M+N+K+L+O+L+K+P+Q+", +"C+C+C+C+C+C+C+C+C+R+S+T+U+V+g W+X+o Y+Z+Z+`+ @o..@+@@@#@$@%@&@%@", +"C+C+C+C+C+C+C+*@=@-@g /+$ ;@& g m+>@8 ,@/ $ '@X+8 $ )@!@~@/ 7 {@", +"]@]@]@]@]@^@/@(@_@a.a.% M./ :@<@[@n+f M.}@|@/ G+n.1@g X+X+/+6+$ "}; diff -Nru bloboats-1.0.1.dsfg/debian/install bloboats-1.0.2+dfsg/debian/install --- bloboats-1.0.1.dsfg/debian/install 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/install 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1,3 @@ +debian/icons/bloboats.xpm usr/share/pixmaps +debian/icons/bloboats.png usr/share/pixmaps +debian/bloboats.desktop usr/share/applications diff -Nru bloboats-1.0.1.dsfg/debian/manpages bloboats-1.0.2+dfsg/debian/manpages --- bloboats-1.0.1.dsfg/debian/manpages 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/manpages 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1 @@ +debian/bloboats.6 diff -Nru bloboats-1.0.1.dsfg/debian/menu bloboats-1.0.2+dfsg/debian/menu --- bloboats-1.0.1.dsfg/debian/menu 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/menu 2013-05-21 15:27:47.000000000 +0000 @@ -1,3 +1,6 @@ -?package(bloboats):needs="X11" section="Games/Action"\ - title="Bloboats" command="/usr/games/bloboats" \ - icon="bloboats.xpm" +?package(bloboats):needs="X11" \ + section="Games/Action" \ + title="Bloboats" \ + longtitle="Bloboats - a boat racing game" \ + command="/usr/games/bloboats" \ + icon="/usr/share/pixmaps/bloboats.xpm" diff -Nru bloboats-1.0.1.dsfg/debian/patches/01-fix_segfault_notebook.patch bloboats-1.0.2+dfsg/debian/patches/01-fix_segfault_notebook.patch --- bloboats-1.0.1.dsfg/debian/patches/01-fix_segfault_notebook.patch 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/01-fix_segfault_notebook.patch 2013-05-27 14:37:32.000000000 +0000 @@ -0,0 +1,33 @@ +Description: Add fix_segfault_notebook.diff to avoid a segfault if the screen + doesn't accept 1024x768 like most of the notebook computer +Author: Gonéri Le Bouder +Bug-Debian: http://bugs.debian.org/523271 + +Index: bloboats-1.0.2.dsfg/src/main.cpp +=================================================================== +--- bloboats-1.0.2.dsfg.orig/src/main.cpp 2010-11-24 01:23:12.000000000 +0700 ++++ bloboats-1.0.2.dsfg/src/main.cpp 2012-03-06 20:05:58.595691437 +0700 +@@ -184,7 +184,7 @@ + + if (Config.fullscreen) flags |= SDL_FULLSCREEN; + +- SDL_Surface *s; ++ SDL_Surface *s = NULL; + + if (!manualres) { + s = Window.OpenWindow(Config.reswidth, Config.resheight, 32, flags); +Index: bloboats-1.0.2.dsfg/src/window.cpp +=================================================================== +--- bloboats-1.0.2.dsfg.orig/src/window.cpp 2010-08-26 03:07:46.000000000 +0700 ++++ bloboats-1.0.2.dsfg/src/window.cpp 2012-03-06 20:07:28.924139344 +0700 +@@ -53,6 +53,10 @@ + + + screen = SDL_SetVideoMode(width, height, bpp, flags); ++ ++ if (!screen) ++ return NULL; ++ + SDL_EventState(SDL_VIDEOEXPOSE, SDL_ENABLE); + + // Set viewport diff -Nru bloboats-1.0.1.dsfg/debian/patches/02-fix-Makefile.patch bloboats-1.0.2+dfsg/debian/patches/02-fix-Makefile.patch --- bloboats-1.0.1.dsfg/debian/patches/02-fix-Makefile.patch 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/02-fix-Makefile.patch 2013-05-27 13:40:31.000000000 +0000 @@ -0,0 +1,140 @@ +From: Debian Games Team +Date: Tue, 21 May 2013 00:12:15 +0200 +Subject: 02-fix-Makefile + +=================================================================== +--- + Makefile | 63 +++++++++++++++++++++++++++++++++++++------------------------- + 1 file changed, 38 insertions(+), 25 deletions(-) + +diff --git a/Makefile b/Makefile +index f1ecef5..539d9fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -7,17 +7,21 @@ + ### Installation directory (Installation prefix) + # If you don't have root privileges, set this to /home/tentacleman/bloboats/ + # for example, otherwise /. Don't use ~ or other environment variables! +-PREFIX = / ++PREFIX ?= / ++ ++### Destination directory (Packager only) ++DESTDIR ?= + + ### Or if you don't want to run make install at all, uncomments the next line + # and comment the line below. Compile and run with './bin/bloboats' + #DATADIR = data + +-DATADIR = $(PREFIX)/usr/games/bloboats/data ++DATADIR ?= $(PREFIX)/usr/games/bloboats/data + + ### If you do make install, you may perhaps want to set these +-BINARYDIR = $(PREFIX)/usr/bin +-CONFIGDIR = $(PREFIX)/etc ++ ++BINARYDIR ?= $(PREFIX)/usr/bin ++CONFIGDIR ?= $(PREFIX)/etc + + PRIVATEDIR = ~/.bloboats + +@@ -27,7 +31,10 @@ PRIVATEDIR = ~/.bloboats + # SDL, SDL_image, SDL_mixer to compile. Libvorbis for music support. + # OpenGL support. + +-SOUND = 1 ++# since the sound files were removed from the tarball (see: README.Debian), we ++# turn off the sound support ++ ++SOUND = 0 + MUSIC = 1 + DEBUG = 0 + +@@ -40,7 +47,7 @@ DEBUG = 0 + + + #This should probably be DEFAULT +-TARGET = DEFAULT ++TARGET ?= DEFAULT + + + ### Only some random settings below +@@ -72,7 +79,8 @@ SDLCONFIG_CROSS = i586-mingw32msvc-sdl-config + SDLCONFIG = $(SDLCONFIG_$(TARGET)) + + ### Libs +-LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU ++# no sound enable => no SDL_Mixer ++LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lGL -lGLU + LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -L/usr/X11R6/lib -lGL -lGLU + LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -L/usr/pkg/lib + LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -framework OpenGL +@@ -132,18 +140,22 @@ CXXFLAGS_MACOSX_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 + CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 + CXXFLAGS_ = $(CXXFLAGS_$(TARGET)_) + +-all: config main ++all: config-stamp build-stamp + +-main: $(OBJ) ++#main: $(OBJ) ++build-stamp: build ++build: config-stamp $(OBJ) + mkdir -p bin + $(CXX) $(OBJ) $(LIBS) $(CXXFLAGS) +- $(STRIP) bin/$(BINARY) ++ touch build-stamp ++ #$(STRIP) bin/$(BINARY) + + icon: + $(ICON_CMD) + $(CXX) -o bin/$(BINARY) $(OBJ) $(ICON) $(LIBS) +- $(STRIP) bin/$(BINARY) ++ #$(STRIP) bin/$(BINARY) + ++config-stamp: config + config: + echo "datadir $(DATADIR)" >bloboats.dirs + echo "privatedir $(PRIVATEDIR)" >>bloboats.dirs +@@ -152,16 +164,16 @@ config: + echo "#define SOUND $(SOUND)" >> src/compiling_settings.h + echo "#define MUSIC $(MUSIC)" >> src/compiling_settings.h + echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h ++ touch config-stamp + +-install: +- mkdir -p $(BINARYDIR)/ +- mkdir -p $(CONFIGDIR)/ +- cp bloboats.dirs $(CONFIGDIR)/ +- mkdir -p $(DATADIR)/ +- cp -R data/* $(DATADIR)/ +- cp bin/$(BINARY) $(BINARYDIR)/ +- chmod -R 744 $(DATADIR) +- chmod 755 `find $(DATADIR) -type d` ++install: build-stamp ++ mkdir -p $(DESTDIR)/$(BINARYDIR)/ ++ mkdir -p $(DESTDIR)/$(CONFIGDIR)/ ++ cp bloboats.dirs $(DESTDIR)/$(CONFIGDIR)/ ++ mkdir -p $(DESTDIR)/$(DATADIR)/ ++ cp -R data/* $(DESTDIR)/$(DATADIR)/ ++ cp bin/$(BINARY) $(DESTDIR)/$(BINARYDIR)/ ++ chmod 755 `find $(DESTDIR)/$(DATADIR) -type d` + + uninstall: + rm -f $(CONFIGDIR)/bloboats.dirs +@@ -173,10 +185,11 @@ uninstall: + + gho: src/viewport.o + $(CXX) src/viewport.o $(LIBS) $(CXXFLAGS_) +- $(STRIP) bin/$(BINARY_) ++ #$(STRIP) bin/$(BINARY_) + + clean: +- rm bloboats.dirs +- rm src/*.o +- rm src/models/*.o +- rm bin/$(BINARY) ++ rm -f bloboats.dirs ++ rm -f src/*.o ++ rm -f src/models/*.o ++ rm -f bin/$(BINARY) ++ rm -f *-stamp diff -Nru bloboats-1.0.1.dsfg/debian/patches/03-uint32.patch bloboats-1.0.2+dfsg/debian/patches/03-uint32.patch --- bloboats-1.0.1.dsfg/debian/patches/03-uint32.patch 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/03-uint32.patch 2013-05-27 14:37:32.000000000 +0000 @@ -0,0 +1,39 @@ +Description: Fix segfault at start up +Author: Raphael Geissert +Bug-Debian: http://bugs.debian.org/523271 + +Index: bloboats-1.0.2.dsfg/src/window.cpp +=================================================================== +--- bloboats-1.0.2.dsfg.orig/src/window.cpp 2012-03-06 20:16:41.778880814 +0700 ++++ bloboats-1.0.2.dsfg/src/window.cpp 2012-03-06 20:18:06.671301767 +0700 +@@ -36,7 +36,7 @@ + + + +-SDL_Surface * window::OpenWindow(int w, int h, int b, int flags) { ++SDL_Surface * window::OpenWindow(int w, int h, int b, Uint32 flags) { + if (!flags) { + flags = oldflags^SDL_FULLSCREEN; + } +Index: bloboats-1.0.2.dsfg/src/window.h +=================================================================== +--- bloboats-1.0.2.dsfg.orig/src/window.h 2006-08-03 05:05:36.000000000 +0700 ++++ bloboats-1.0.2.dsfg/src/window.h 2012-03-06 20:18:34.023437399 +0700 +@@ -31,7 +31,7 @@ + window(); + ~window(); + +- SDL_Surface * OpenWindow(int width, int height, int bpp, int flags); ++ SDL_Surface * OpenWindow(int width, int height, int bpp, Uint32 flags); + void SetTitle(char *text, char *icon); + bool Iconify(); + +@@ -52,7 +52,7 @@ + + int xlast, ylast; + +- int oldflags; ++ Uint32 oldflags; + + private: + SDL_Surface *screen; diff -Nru bloboats-1.0.1.dsfg/debian/patches/Hardening.patch bloboats-1.0.2+dfsg/debian/patches/Hardening.patch --- bloboats-1.0.1.dsfg/debian/patches/Hardening.patch 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/Hardening.patch 2013-05-27 14:37:32.000000000 +0000 @@ -0,0 +1,21 @@ +From: Markus Koschany +Date: Tue, 21 May 2013 00:29:34 +0200 +Subject: Hardening + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 539d9fd..579309d 100644 +--- a/Makefile ++++ b/Makefile +@@ -146,7 +146,7 @@ all: config-stamp build-stamp + build-stamp: build + build: config-stamp $(OBJ) + mkdir -p bin +- $(CXX) $(OBJ) $(LIBS) $(CXXFLAGS) ++ $(CXX) $(LDFLAGS) $(OBJ) $(LIBS) $(CXXFLAGS) + touch build-stamp + #$(STRIP) bin/$(BINARY) + diff -Nru bloboats-1.0.1.dsfg/debian/patches/fix_makefile.patch bloboats-1.0.2+dfsg/debian/patches/fix_makefile.patch --- bloboats-1.0.1.dsfg/debian/patches/fix_makefile.patch 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/fix_makefile.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,123 +0,0 @@ -Index: bloboats-1.0.1.dsfg/Makefile -=================================================================== ---- bloboats-1.0.1.dsfg.orig/Makefile 2008-02-21 17:22:58.000000000 +0100 -+++ bloboats-1.0.1.dsfg/Makefile 2008-02-21 17:24:02.000000000 +0100 -@@ -7,17 +7,19 @@ - ### Installation directory (Installation prefix) - # If you don't have root privileges, set this to /home/tentacleman/bloboats/ - # for example, otherwise /. Don't use ~ or other environment variables! --PREFIX = / -+PREFIX ?= / -+ -+### Destination directory (Packager only) -+DESTDIR ?= - - ### Or if you don't want to run make install at all, uncomments the next line - # and comment the line below. Compile and run with './bin/bloboats' - #DATADIR = data -- --DATADIR = $(PREFIX)/usr/games/bloboats/data -+DATADIR ?= $(PREFIX)/usr/games/bloboats/data - - ### If you do make install, you may perhaps want to set these --BINARYDIR = $(PREFIX)/usr/bin --CONFIGDIR = $(PREFIX)/etc -+BINARYDIR ?= $(PREFIX)/usr/bin -+CONFIGDIR ?= $(PREFIX)/etc - - PRIVATEDIR = ~/.bloboats - -@@ -27,6 +29,8 @@ - # SDL, SDL_image, SDL_mixer and SDL_net to compile. Libvorbis for music support. - # OpenGL support. - -+# since the sound files were removed from the tarball (see: README.Debian), we -+# turn off the sound support - SOUND = 0 - NETWORK = 1 - MUSIC = 0 -@@ -41,7 +45,7 @@ - - - #This should probably be DEFAULT --TARGET = DEFAULT -+TARGET ?= DEFAULT - - - ### Only some random settings below -@@ -73,7 +77,9 @@ - SDLCONFIG = $(SDLCONFIG_$(TARGET)) - - ### Libs --LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -+#LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -+# No sound enable => no SDL_mixer -+LIBS_DEFAULT = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_net -lGL -lGLU - LIBS_FREEBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -L/usr/X11R6/lib -lGL -lGLU - LIBS_NETBSD = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU -L/usr/pkg/lib - LIBS_MACOSX = `$(SDLCONFIG) --libs` -lSDL_image -lSDL_mixer -lSDL_net -framework OpenGL -@@ -133,17 +139,18 @@ - CXXFLAGS_CROSS_ = -g `$(SDLCONFIG) --cflags` -o bin/$(BINARY_) -O2 - CXXFLAGS_ = $(CXXFLAGS_$(TARGET)_) - --all: config main -+all: config-stamp build-stamp - --main: $(OBJ) -+build-stamp: build -+build: config-stamp $(OBJ) - $(CXX) $(OBJ) $(LIBS) $(CXXFLAGS) -- $(STRIP) bin/$(BINARY) -+ touch build-stamp - - icon: - $(ICON_CMD) - $(CXX) -o bin/$(BINARY) $(OBJ) $(ICON) $(LIBS) -- $(STRIP) bin/$(BINARY) - -+config-stamp: config - config: - echo "datadir $(DATADIR)" >bloboats.dirs - echo "privatedir $(PRIVATEDIR)" >>bloboats.dirs -@@ -153,16 +160,16 @@ - echo "#define NETWORK $(NETWORK)" >> src/compiling_settings.h - echo "#define MUSIC $(MUSIC)" >> src/compiling_settings.h - echo "#define DEBUG $(DEBUG)" >> src/compiling_settings.h -+ touch config-stamp - --install: -- mkdir -p $(BINARYDIR)/ -- mkdir -p $(CONFIGDIR)/ -- cp bloboats.dirs $(CONFIGDIR)/ -- mkdir -p $(DATADIR)/ -- cp -R data/* $(DATADIR)/ -- cp bin/$(BINARY) $(BINARYDIR)/ -- chmod -R 744 $(DATADIR) -- chmod 755 `find $(DATADIR) -type d` -+install: build-stamp -+ mkdir -p $(DESTDIR)/$(BINARYDIR)/ -+ mkdir -p $(DESTDIR)/$(CONFIGDIR)/ -+ cp bloboats.dirs $(DESTDIR)/$(CONFIGDIR)/ -+ mkdir -p $(DESTDIR)/$(DATADIR)/ -+ cp -R data/* $(DESTDIR)/$(DATADIR)/ -+ cp bin/$(BINARY) $(DESTDIR)/$(BINARYDIR)/ -+ chmod 755 `find $(DESTDIR)/$(DATADIR) -type d` - - uninstall: - rm -f $(CONFIGDIR)/bloboats.dirs -@@ -174,10 +181,10 @@ - - gho: src/viewport.o - $(CXX) src/viewport.o $(LIBS) $(CXXFLAGS_) -- $(STRIP) bin/$(BINARY_) - - clean: -- rm bloboats.dirs -- rm src/*.o -- rm src/models/*.o -- rm bin/$(BINARY) -+ rm -f bloboats.dirs -+ rm -f src/*.o -+ rm -f src/models/*.o -+ rm -f bin/$(BINARY) -+ rm -f *-stamp diff -Nru bloboats-1.0.1.dsfg/debian/patches/fix_segfault_notebook.diff bloboats-1.0.2+dfsg/debian/patches/fix_segfault_notebook.diff --- bloboats-1.0.1.dsfg/debian/patches/fix_segfault_notebook.diff 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/fix_segfault_notebook.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ ---- bloboats-1.0.1.dsfg.orig/src/main.cpp -+++ bloboats-1.0.1.dsfg/src/main.cpp -@@ -197,7 +197,7 @@ - - if (Config.fullscreen) flags |= SDL_FULLSCREEN; - -- SDL_Surface *s; -+ SDL_Surface *s = NULL; - - if (!manualres) { - switch(Config.resolution) { -@@ -217,9 +217,13 @@ - s = Window.OpenWindow(1280, 1024, 32, flags); - break; - default: -- s = Window.OpenWindow(640, 480, 32, flags); -+ // Do nothing - break; - } -+ -+ if (!s) -+ s = Window.OpenWindow(640, 480, 32, flags); -+ - } else { - s = Window.OpenWindow(reswidth, resheight, 32, flags); - } ---- bloboats-1.0.1.dsfg.orig/src/window.cpp -+++ bloboats-1.0.1.dsfg/src/window.cpp -@@ -53,6 +53,10 @@ - - - screen = SDL_SetVideoMode(width, height, bpp, flags); -+ -+ if (!screen) -+ return NULL; -+ - SDL_EventState(SDL_VIDEOEXPOSE, SDL_ENABLE); - - // Set viewport diff -Nru bloboats-1.0.1.dsfg/debian/patches/series bloboats-1.0.2+dfsg/debian/patches/series --- bloboats-1.0.1.dsfg/debian/patches/series 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/series 2013-05-27 14:37:32.000000000 +0000 @@ -1,3 +1,4 @@ -fix_segfault_notebook.diff -fix_makefile.patch -uint32.diff +01-fix_segfault_notebook.patch +02-fix-Makefile.patch +03-uint32.patch +Hardening.patch diff -Nru bloboats-1.0.1.dsfg/debian/patches/uint32.diff bloboats-1.0.2+dfsg/debian/patches/uint32.diff --- bloboats-1.0.1.dsfg/debian/patches/uint32.diff 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/patches/uint32.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Subject: Bug#523271: bloboats: segfault at start up -From: Raphael Geissert - - -Index: bloboats-1.0.1.dsfg/src/window.cpp -=================================================================== ---- bloboats-1.0.1.dsfg.orig/src/window.cpp -+++ bloboats-1.0.1.dsfg/src/window.cpp -@@ -36,7 +36,7 @@ window::~window(){} - - - --SDL_Surface * window::OpenWindow(int w, int h, int b, int flags) { -+SDL_Surface * window::OpenWindow(int w, int h, int b, Uint32 flags) { - if (!flags) { - flags = oldflags^SDL_FULLSCREEN; - } -Index: bloboats-1.0.1.dsfg/src/window.h -=================================================================== ---- bloboats-1.0.1.dsfg.orig/src/window.h -+++ bloboats-1.0.1.dsfg/src/window.h -@@ -31,7 +31,7 @@ class window - window(); - ~window(); - -- SDL_Surface * OpenWindow(int width, int height, int bpp, int flags); -+ SDL_Surface * OpenWindow(int width, int height, int bpp, Uint32 flags); - void SetTitle(char *text, char *icon); - bool Iconify(); - -@@ -52,7 +52,7 @@ class window - - int xlast, ylast; - -- int oldflags; -+ Uint32 oldflags; - - private: - SDL_Surface *screen; diff -Nru bloboats-1.0.1.dsfg/debian/rules bloboats-1.0.2+dfsg/debian/rules --- bloboats-1.0.1.dsfg/debian/rules 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/rules 2013-05-21 15:27:47.000000000 +0000 @@ -1,65 +1,14 @@ #!/usr/bin/make -f -# -*- makefile -*- -#export DH_VERBOSE=1 -include /usr/share/quilt/quilt.make -CFLAGS = -Wall -g +%: + dh $@ --parallel -ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif - - -build: build-stamp -build-stamp: $(QUILT_STAMPFN) - dh_testdir +override_dh_auto_build: make DATADIR=/usr/share/games/bloboats - docbook-to-man debian/bloboats.sgml > debian/bloboats.6 - touch build-stamp - -clean: unpatch - dh_testdir - [ ! -f bloboats.dirs ] || make clean - rm -f debian/bloboats.6 - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - make DATADIR=/usr/share/games/bloboats DESTDIR=debian/bloboats BINARYDIR=/usr/games install - # xpm - mkdir -p debian/bloboats/usr/share/pixmaps - cp debian/bloboats.xpm debian/bloboats/usr/share/pixmaps - # desktop - mkdir -p debian/bloboats/usr/share/applications - cp debian/bloboats.desktop debian/bloboats/usr/share/applications - -binary-indep: build install - -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs INTRO.txt readme.txt debian/README.Debian - dh_installman debian/bloboats.6 - dh_installmenu - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install +override_dh_auto_install: + make \ + DATADIR=/usr/share/games/bloboats \ + DESTDIR=debian/bloboats \ + BINARYDIR=/usr/games install diff -Nru bloboats-1.0.1.dsfg/debian/source/format bloboats-1.0.2+dfsg/debian/source/format --- bloboats-1.0.1.dsfg/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/source/format 2013-06-02 23:49:07.766467155 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru bloboats-1.0.1.dsfg/debian/source/include-binaries bloboats-1.0.2+dfsg/debian/source/include-binaries --- bloboats-1.0.1.dsfg/debian/source/include-binaries 1970-01-01 00:00:00.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/source/include-binaries 2013-05-21 15:27:47.000000000 +0000 @@ -0,0 +1 @@ +debian/icons/bloboats.png diff -Nru bloboats-1.0.1.dsfg/debian/watch bloboats-1.0.2+dfsg/debian/watch --- bloboats-1.0.1.dsfg/debian/watch 2013-06-02 23:49:07.000000000 +0000 +++ bloboats-1.0.2+dfsg/debian/watch 2013-05-21 15:27:47.000000000 +0000 @@ -1,2 +1,3 @@ version=3 -opts="dversionmangle=s/\.dsfg//" http://bloboats.blobtrox.net/download.php .*/bloboats-([0-9.]+)\.tar\.gz +opts="dversionmangle=s/\+dfsg//" \ +http://bloboats.blobtrox.net/download.php .*/bloboats-([0-9.]+)\.(?:zip|tgz|tbz2|txz|tar\.gz|tar\.bz2|tar\.xz) diff -Nru bloboats-1.0.1.dsfg/readme.txt bloboats-1.0.2+dfsg/readme.txt --- bloboats-1.0.1.dsfg/readme.txt 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/readme.txt 2010-11-23 18:36:38.000000000 +0000 @@ -1,4 +1,4 @@ -Bloboats 1.0.1 by Markus "MakeGho" Kettunen , http://bloboats.dy.fi/ +Bloboats 1.0.2 by Markus "MakeGho" Kettunen , http://bloboats.blobtrox.net/ 1. Babble babble 2. Installation and configuring @@ -32,6 +32,7 @@ Bloboats is licensed under GNU GPL 2 except for some data files. For details, see "5. License and copying" and file "copying.txt". +The game was ranked 4th out of 14 competitors. 2. Installation and configuring @@ -40,19 +41,15 @@ - Install SDL (http://www.libsdl.org, dev and runtime) - Install SDL_image (http://www.libsdl.org/projects/SDL_image, dev and runtime) - Install SDL_mixer (http://www.libsdl.org/projects/SDL_mixer, dev and runtime) -- Install SDL_net (http://www.libsdl.org/projects/SDL_net, dev and runtime) - Install libvorbis It is possible to install without sounds (SDL_mixer) by setting SOUND = 0 in the Makefile and deleting all -lSDL_mixer entries. -It is possible to install without network support (SDL_net) by setting NETWORK = 0 in the makefile -and deleting all -lSDL_net entries. - Installation steps: 1. Open Makefile in a text editor -2. Read the help lines and do needed changes +2. Read the help lines and apply the needed changes 3. Compile by typing 'make', or if that doesn't work, try 'gmake'. Make sure you have writing permissions to the installation directory (you may specify it in the Makefile). Also make sure you have SDL-dev, SDL_image-dev, SDL_net-dev and SDL_mixer-dev. @@ -93,7 +90,7 @@ - Pauli "Gwaur" Marttinen for all the music in the game and data/images/ground2.png - Jouni "Cornix" Puotila for data/images/bloboats.png - Miiro "miiro" Lindfors for data/images/alus.png - - Henri "str4nd" Strand for pages at http://bloboats.dy.fi/ + - Henri "str4nd" Strand for the homepage - Aspekt - Blobtrox - Fingersoft @@ -173,7 +170,7 @@ The recording files are just heavily compressed keyboard layout maps for every frame, thus if you ever encounter a recording that "doesn't work" although it might even be in the -public scoreboard (http://bloboats.dy.fi/), it is most probably because your computer and +public scoreboard (http://bloboats.blobtrox.net/), it is most probably because your computer and the player's computer calculate floating point calculations a bit differently. Although the error for one calculation is really small, it cumulates and may corrupt the recording. @@ -183,11 +180,8 @@ 4.6. Public scoreboard -The game includes support for automatically sending the best scores to the public scoreboard -server at http://bloboats.dy.fi/. If options->upload scores button doesn't work or you can't -see it doing anything, please considering uploading your recording files manually. Also, -if your time wasn't green coloured, the game won't send your time at all. If you wish, you -may still add that time manually. +You can submit your best times to the public scoreboard at http://bloboats.blobtrox.net/ +by pressing the "Add a record!" link in the main page. Tip: private/ghost directory has your best recordings for all the levels. @@ -200,8 +194,7 @@ 5. License and copying -Bloboats is released under GNU GPL version 2, except for some these sound files that are licensed -under the Sampling Plus 1.0 license (http://creativecommons.org/licenses/sampling+/1.0/): +See "copying.txt" Samples used from Freesound: diff -Nru bloboats-1.0.1.dsfg/src/condition.cpp bloboats-1.0.2+dfsg/src/condition.cpp --- bloboats-1.0.1.dsfg/src/condition.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/condition.cpp 2010-08-25 21:55:02.000000000 +0000 @@ -16,7 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +/* #include "condition.h" #include "compat.h" @@ -94,9 +94,9 @@ done=true; break; } - + } while(!done); - + } // if } @@ -134,7 +134,7 @@ void condition::add_char(char c) { - if (size >= 1024) { + if (size > 4096-1) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -145,7 +145,7 @@ } void condition::add_uint8(Uint8 u) { - if (size >= 1024) { + if (size > 4096-1) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -154,7 +154,7 @@ } void condition::add_uint16(Uint16 u) { - if (size >= 1023) { + if (size > 4096-2) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -168,7 +168,7 @@ void condition::add_uint32(Uint32 u) { - if (size >= 1021) { + if (size > 4096-4) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -181,7 +181,7 @@ void condition::add_float(float u) { - if (size >= 1021) { + if (size > 4096-4) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -195,7 +195,7 @@ void condition::add_double(double u) { - if (size >= 1017) { + if (size > 4096-8) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -221,7 +221,7 @@ void condition::add_key(char *k) { // adds a 10-byte 'key' to data - if (size >= 1015) { + if (size > 4096-10) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -240,7 +240,7 @@ void condition::add_string(char *s) { // adds a 200-byte string to data - if (size >= 823) { + if (size > 4096-200) { fprintf (stderr, "Error: no space in condition!\n"); exit(1); } @@ -282,7 +282,7 @@ set_error("Error: no more data in condition!"); return 0; } - + Uint16 *p = (Uint16*)&data[cursor]; cursor += 2; @@ -294,7 +294,7 @@ set_error("Error: no more data in condition!"); return 0; } - + Uint32 *p = (Uint32*)&data[cursor]; cursor += 4; @@ -306,7 +306,7 @@ set_error("Error: no more data in condition!"); return 0; } - + Uint32 *p = (Uint32*)&data[cursor]; float *f = (float*)SWAP32(*p); @@ -432,4 +432,4 @@ size = s; } - +*/ diff -Nru bloboats-1.0.1.dsfg/src/condition.h bloboats-1.0.2+dfsg/src/condition.h --- bloboats-1.0.1.dsfg/src/condition.h 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/condition.h 2010-08-25 21:56:20.000000000 +0000 @@ -16,7 +16,8 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - + +/* #ifndef _CONDITION_H_ #define _CONDITION_H_ @@ -46,7 +47,7 @@ const int as[9] = { 0,1,1,2,4,4,8,10,200 }; - + enum command { JOIN, TRACKER, @@ -57,17 +58,17 @@ }; const int commandsize[COMMANDS] = { - /* Join: id-code, key nick, key pass */ + // Join: id-code, key nick, key pass as[T_UINT32] + as[T_KEY] + as[T_KEY], - /* Tracker: ip, port */ + // Tracker: ip, port as[T_UINT32] + as[T_UINT16], - /* Ack: id */ + // Ack: id as[T_UINT16], - /* Sendfile: special */ + // Sendfile: special 0, - /* Connect: key nick, key pass */ + // Connect: key nick, key pass as[T_KEY] + as[T_KEY], - /* Connection accepted: uint32 sec_id */ + // Connection accepted: uint32 sec_id as[T_UINT32] }; @@ -76,7 +77,7 @@ NO_REQ, REQ }; - + class condition { public: condition(Uint8 t, Uint8 r, enum varlist vl, ... ); @@ -130,7 +131,7 @@ int channel; Uint32 cursor; // used for reading - Uint8 data[1024]; + Uint8 data[4096]; private: Uint32 size; @@ -151,4 +152,4 @@ #endif - +*/ diff -Nru bloboats-1.0.1.dsfg/src/config.cpp bloboats-1.0.2+dfsg/src/config.cpp --- bloboats-1.0.1.dsfg/src/config.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/config.cpp 2010-08-25 21:12:08.000000000 +0000 @@ -30,7 +30,9 @@ } void config::load() { - resolution=3; + reswidth = SDL_GetVideoInfo()->current_w; + resheight = SDL_GetVideoInfo()->current_h; + decoration=2; currentplayer=-1; showghost=true; @@ -67,9 +69,16 @@ #endif FILE *fp = fopen( Path->priv("config.dat"), "r"); - if (fp) { - fscanf(fp, "resolution %d\n", &resolution); - if (resolution < 1 || resolution > 5) resolution = 1; + if (fp) { + unsigned int temp; + fscanf(fp, "resolution %d\n", &temp); + if ( temp <= 65535 ) { + reswidth = SDL_GetVideoInfo()->current_w; + resheight = SDL_GetVideoInfo()->current_h; + } else { + reswidth = (temp & 0xFFFF0000) >> 16; + resheight = temp & 0x0000FFFF; + } int tmp=0; @@ -85,6 +94,7 @@ if (tmp==1) showghost=true; else showghost=false; } + if ( fscanf(fp, "sounds %d\n", &tmp) == 1) { if (tmp==1) sounds=true; @@ -155,7 +165,7 @@ FILE *fp = fopen( Path->priv("config.dat"), "w+"); if (fp) { - fprintf (fp, "resolution %d\n", resolution); + fprintf (fp, "resolution %d\n", (reswidth << 16) | resheight); fprintf (fp, "decoration %d\n", decoration); fprintf (fp, "currentplayer %d\n", currentplayer); fprintf (fp, "showghost %d\n", showghost); diff -Nru bloboats-1.0.1.dsfg/src/config.h bloboats-1.0.2+dfsg/src/config.h --- bloboats-1.0.1.dsfg/src/config.h 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/config.h 2010-08-25 20:27:04.000000000 +0000 @@ -50,21 +50,23 @@ void load(); void save(); - int resolution; + unsigned int reswidth; + unsigned int resheight; + int decoration; bool showghost; int currentplayer; bool sounds; int music; - + Uint16 keys[9]; float zoomlevel; Uint32 newtimes; Uint32 tux; - + int soundvol; int musicvol; diff -Nru bloboats-1.0.1.dsfg/src/copyright bloboats-1.0.2+dfsg/src/copyright --- bloboats-1.0.1.dsfg/src/copyright 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/copyright 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -/* - Bloboats - a boat racing game by Blobtrox - Copyright (C) 2006 Markus "MakeGho" Kettunen - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - - diff -Nru bloboats-1.0.1.dsfg/src/font.cpp bloboats-1.0.2+dfsg/src/font.cpp --- bloboats-1.0.1.dsfg/src/font.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/font.cpp 2010-08-25 19:26:54.000000000 +0000 @@ -73,7 +73,7 @@ float y = cy; glBlendFunc(GL_SRC_ALPHA,GL_ONE_MINUS_SRC_ALPHA); - + glBegin(GL_QUADS); for (int i=0; ibendright(dt); if (record) recdat |= RECORD_RIGHT; } - + if (Keyboard.Hold(Config.keys[KEY_JUMP])) { malli->strive(dt); if (record) recdat |= RECORD_C; } - + if (Keyboard.Pressed(Config.keys[KEY_TURN])==1) { if( malli->flip(taso->w, taso->numwalls) ) { if (record) recdat |= RECORD_SPACE; @@ -381,7 +381,7 @@ fwd /= 1.01; } } - + bool engines=false; if (Keyboard.Hold(Config.keys[KEY_THRUST]) && !Keyboard.Hold(Config.keys[KEY_REVERSE])) { malli->stretchup(dt); @@ -411,7 +411,7 @@ if ( ghostdat & RECORD_RIGHT ) { ghostboat->bendright(dt); } - + if ( ghostdat & RECORD_C ) { ghostboat->strive(dt); } @@ -435,7 +435,7 @@ engines=true; } - if (ghost && !player) { + if (ghost && !player) { if (engines) sound::ChannelVolume(0, (int)(0.80*12.8*Config.soundvol) ); else sound::ChannelVolume(0, (int)(0.40*12.8*Config.soundvol) ); } @@ -446,7 +446,7 @@ if (record && !dead) { // recording player's game recelement = recelement->add(recdat); } - + // end of control section @@ -464,12 +464,12 @@ for (int i=0; inumwalls; i++) { taso->w[i].seticetexture(iceID); - taso->w[i].setgroundtexture(groundID); + taso->w[i].setgroundtexture(groundID); } } } - + // miscellaneous controls if (Keyboard.Pressed(SDLK_F2)) { @@ -700,23 +700,23 @@ default: break; } - + sound::PlayChunk(-1,Media.explosion,0); - + dead = true; mallidead = new broken(malli ); if (!deadstop) deadstop = SDL_GetTicks() + deadwait; - + sound::HaltChannel(0); // vroom, engines halt sound::ChannelVolume(0, (int)(12.8*Config.soundvol) ); - + } else { // tux tuxfound=true; } // if } // if - + } } @@ -759,17 +759,17 @@ default: break; } - + sound::PlayChunk(-1,Media.explosion,0); - + gdead = true; ghostdead = new broken(ghostboat); if (!deadstop) deadstop = SDL_GetTicks() + deadwait; - + sound::HaltChannel(0); // vroom, engines halt sound::ChannelVolume(0, (int)(12.8*Config.soundvol) ); - + } } // if !tux @@ -865,7 +865,7 @@ glEnd(); glColor3f(1.0,1.0,1.0); - + glEnable(GL_TEXTURE_2D); glEnable(GL_BLEND); } @@ -958,7 +958,7 @@ } } - + // detect the particle closest to m double closestp_d = 1000; for (int i=0; inumparticles; i++) { @@ -973,27 +973,27 @@ double closests_d = 1000; for (int i=0; inumsprings; i++) { // compare distance from the midpoints of the line segments - + vec avg = (malli->s[i].p1->p + malli->s[i].p2->p)/2; double d = (m - avg).abs(); - + if (d < closests_d) { closests_d = d; closests = i; } } - + char text1[200]; char text2[200]; char text3[200]; char text4[200]; char text5[200]; - sprintf (text1, "NEAREST PARTICLE: %d", closestp); - sprintf (text2, "NEAREST SPRING: %d", closests); + sprintf (text1, "NEAREST PARTICLE: %d", closestp); + sprintf (text2, "NEAREST SPRING: %d", closests); sprintf (text3, "X: %f Y: %f", m.x, m.y); sprintf (text4, "NEAREST WALL: %d.%d", closestw, closestside); sprintf (text5, "WALL TYPE: %d", closesttype); - + Font_bl.WriteString(text1, 1, 1, 16); Font_bl.WriteString(text2, 1, 16, 16); Font_bl.WriteString(text3, 1, 31, 16); @@ -1003,15 +1003,15 @@ - + // set camera to follow player - + vec c; if (player) c = malli->midpoint(); else c = ghostboat->midpoint(); Window.Center(c.x+fwd, c.y); - + // draw goal glDisable(GL_BLEND); goal->display(); @@ -1030,7 +1030,7 @@ if (!gdead) ghostboat->display(); else ghostdead->display(); } - } + } if (player) { glDisable(GL_BLEND); @@ -1102,7 +1102,7 @@ } - + glFinish(); SDL_GL_SwapBuffers(); diff -Nru bloboats-1.0.1.dsfg/src/graphics.cpp bloboats-1.0.2+dfsg/src/graphics.cpp --- bloboats-1.0.1.dsfg/src/graphics.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/graphics.cpp 2010-08-25 19:26:50.000000000 +0000 @@ -131,13 +131,13 @@ glTexCoord2f(tx1, ty1); glVertex2f(x1, y1); - + glTexCoord2f(tx2, ty2); glVertex2f(x2, y2); - + glTexCoord2f(tx3, ty3); glVertex2f(x3, y3); - + glEnd(); } else { diff -Nru bloboats-1.0.1.dsfg/src/graphics.h bloboats-1.0.2+dfsg/src/graphics.h --- bloboats-1.0.1.dsfg/src/graphics.h 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/graphics.h 2010-08-25 19:26:58.000000000 +0000 @@ -45,7 +45,7 @@ void DrawIMG(SDL_Surface *destsurface, SDL_Surface *img, int x, int y); void DrawPartOfIMG(SDL_Surface *destsurface, SDL_Surface *img, int x, int y, int w, int h, int x2, int y2); void SetTransparentColor(SDL_Surface *image, Uint8 r, Uint8 g, Uint8 b); - + void RemoveTransparentColor(SDL_Surface *image, Uint8 r, Uint8 g, Uint8 b); Uint32 MapRGB(SDL_Surface *image, Uint8 r, Uint8 g, Uint8 b); void GetRGB(Uint32 pixel, SDL_PixelFormat *fmt, Uint8 *r, Uint8 *g, Uint8 *b); diff -Nru bloboats-1.0.1.dsfg/src/handler.cpp bloboats-1.0.2+dfsg/src/handler.cpp --- bloboats-1.0.1.dsfg/src/handler.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/handler.cpp 2010-08-25 21:57:46.000000000 +0000 @@ -16,7 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +/* #include #include @@ -81,7 +81,7 @@ void handler::packet_ready(int channel) { p->channel = channel; - + *(Uint32*)(p->data) = SWAP32(P_BLOBOATS); p->data[4] = P_VERSION; @@ -104,11 +104,6 @@ int handler::packet_send() { -/* for (int i=0; ilen; i++) { - fprintf(stderr, "%2x ", p->data[i]); - if (i%20==19) fprintf (stderr, "\n"); - } -*/ fprintf (stderr, "\n"); return SDLNet_UDP_Send(sock, p->channel, p); } @@ -148,7 +143,7 @@ else id = package_num++; (*it)->set_id(id); - + *(Uint16*)&p->data[p->len] = SWAP16(id); p->len+=2; @@ -178,7 +173,7 @@ } // if } // for - + // attach conditions from req-stack to packages for (it = reqs.begin(); it != reqs.end(); it++) { if ( (*it)->channel == channel && @@ -216,7 +211,7 @@ p->len += s_size; mustsend = true; } // if (too old) - + } // if } // for @@ -241,7 +236,7 @@ while ( (result = SDLNet_UDP_Recv(sock, p)) == 1 ) { - + // check that the packet has a header if (p->len < 5) { fprintf (stderr, "Got a packet with no header!\n"); @@ -326,7 +321,7 @@ Uint16 packlen = 0; if ( type == SENDFILE ) { - Uint16 k = *(Uint16*)&p->data[cursor]; /* file len */ + Uint16 k = *(Uint16*)&p->data[cursor]; // file len cursor += 2; packlen = SWAP32(k); } else { @@ -356,14 +351,14 @@ } fprintf (stderr, "Got ack.\n"); continue; - } + } // Here we go. If it requests for answer and we know him, do ack to it if (req && p->channel >= 0) { // automatically send an ack-packet condition ackpacket(ACK, 0, VAR_LIST, T_UINT16, id, END_OF_LIST); - stack_add(&ackpacket, p->channel); + stack_add(&ackpacket, p->channel); // todo: ping } @@ -376,7 +371,7 @@ newcond->set_type(type); newcond->set_req(req); newcond->set_data( &p->data[cursor], packlen ); - cursor += packlen; + cursor += packlen; newcond->rewind(); @@ -386,11 +381,6 @@ // printf ("Received a packet.\n"); -/* for (int i=0; ilen; i++) { - printf("%2x ", p->data[i]); - if (i%20==19) printf ("\n"); - } -*/ } // while @@ -443,3 +433,4 @@ #endif +*/ diff -Nru bloboats-1.0.1.dsfg/src/handler.h bloboats-1.0.2+dfsg/src/handler.h --- bloboats-1.0.1.dsfg/src/handler.h 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/handler.h 2010-08-25 21:58:02.000000000 +0000 @@ -16,7 +16,7 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ - +/* #ifndef _HANDLER_H_ #define _HANDLER_H_ @@ -67,7 +67,7 @@ void stack_add(condition *c, int channel); int send(int channel); - int recv(); + int recv(); UDPsocket get_sock(); @@ -84,13 +84,13 @@ UDPsocket sock; UDPpacket *p; #endif - -}; +}; #endif +*/ diff -Nru bloboats-1.0.1.dsfg/src/icon.rc bloboats-1.0.2+dfsg/src/icon.rc --- bloboats-1.0.1.dsfg/src/icon.rc 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/icon.rc 2010-08-25 19:35:32.000000000 +0000 @@ -1 +1 @@ -101 ICON data/images/icon.ico +101 ICON "../data/images/icon.ico" diff -Nru bloboats-1.0.1.dsfg/src/main.cpp bloboats-1.0.2+dfsg/src/main.cpp --- bloboats-1.0.1.dsfg/src/main.cpp 2006-08-02 23:42:35.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/main.cpp 2010-11-23 18:23:12.000000000 +0000 @@ -1,6 +1,6 @@ /* Bloboats - a boat racing game by Blobtrox - Copyright (C) 2006 Markus "MakeGho" Kettunen + Copyright (C) 2006, 2010 Markus "MakeGho" Kettunen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -52,10 +52,6 @@ water Water; -//SDL_Surface *screen; - - - // this system uses metric system, positive y means upwards, positive x means right @@ -64,9 +60,9 @@ Uint32 flags = SDL_OPENGL; -int main(int argc, char*argv[]) { +int main(int argc, char *argv[]) { - printf("Bloboats version 1.0.1, Copyright (C) 2006 Markus Kettunen\n"); + printf("Bloboats version 1.0.2, Copyright (C) 2006, 2010 Markus Kettunen\n"); printf("Bloboats comes with ABSOLUTELY NO WARRANTY; for details check\n"); printf("file \"copying.txt\".\n"); printf("This is free software, and you are welcome to redistribute it\n"); @@ -80,11 +76,11 @@ atexit(SDL_Quit); - // On Windows, chdir to binary dir +/* // On Windows, chdir to binary dir #ifdef __WIN32__ char binbuf[200]; if (!GetModuleFileName( NULL, binbuf, 200 ) ) { - fprintf (stderr, "GetModuleFileName failed (%d). \n", GetLastError() ); + fprintf (stderr, "GetModuleFileName failed (%d). \n", (int)GetLastError() ); } // cut until get the last '\' :-P for (int i = strlen(binbuf)-1; i>=0; i--) { @@ -93,7 +89,7 @@ } chdir(binbuf); #endif - +*/ // config directories @@ -111,7 +107,7 @@ for (int i=1; i 2048 - || resheight > 1536) + if (reswidth <= 0 || resheight <= 0) { - printf ("Please choose a width between 1 and 2048 and height between 1 and 1536.\n"); + printf ("Incorrect resolution.\n"); exit(1); } manualres=true; - // Configs - if (reswidth == 640 && resheight == 480) Config.resolution = 1; - else if (reswidth == 800 && resheight == 600) Config.resolution = 2; - else if (reswidth == 1024 && resheight == 768) Config.resolution = 3; - else if (reswidth == 1280 && resheight == 960) Config.resolution = 4; - else if (reswidth == 1280 && resheight == 1024) Config.resolution = 5; - - } else if (strcmp(argv[i], "--help")==0 || strcmp(argv[i], "-h")==0 || strcmp(argv[i], "-?")==0 || strcmp(argv[i], "?")==0 || strcmp(argv[i], "/?")==0 || strcmp(argv[i], "/h")==0) { printf("Bloboats\n"); - printf("By Markus Kettunen \n"); + printf("By Markus Kettunen \n"); printf("\n"); - printf("Distributed under GNU GPL version 2. See \"copying.txt\".\n"); + printf("See file \"copying.txt\" for license.\n"); printf("\n"); printf("Possible flags:\n"); printf(" --nosound disables sounds\n"); @@ -168,7 +155,7 @@ printf(" --help prints this help\n"); return 0; - } else { + } else { // Test existence FILE *fp = fopen(argv[i], "rb"); if (!fp) { @@ -185,7 +172,7 @@ } } - // Start sound system + // Start sound system #if SOUND == 1 if (Config.sounds) { sound::Start(); @@ -199,33 +186,14 @@ SDL_Surface *s; - if (!manualres) { - switch(Config.resolution) { - case 1: - s = Window.OpenWindow(640, 480, 32, flags); - break; - case 2: - s = Window.OpenWindow(800, 600, 32, flags); - break; - case 3: - s = Window.OpenWindow(1024, 768, 32, flags); - break; - case 4: - s = Window.OpenWindow(1280, 960, 32, flags); - break; - case 5: - s = Window.OpenWindow(1280, 1024, 32, flags); - break; - default: - s = Window.OpenWindow(640, 480, 32, flags); - break; - } + if (!manualres) { + s = Window.OpenWindow(Config.reswidth, Config.resheight, 32, flags); } else { s = Window.OpenWindow(reswidth, resheight, 32, flags); } if (!s) { - fprintf (stderr, "Couldn't set screenmode: %s\n", SDL_GetError()); + fprintf (stderr, "Couldn't set screen mode: %s\n", SDL_GetError()); exit(1); } diff -Nru bloboats-1.0.1.dsfg/src/menu.cpp bloboats-1.0.2+dfsg/src/menu.cpp --- bloboats-1.0.1.dsfg/src/menu.cpp 2006-08-02 23:05:36.000000000 +0000 +++ bloboats-1.0.2+dfsg/src/menu.cpp 2010-08-25 21:55:26.000000000 +0000 @@ -36,7 +36,7 @@ #include #include - +#include #define RECORDVERSION 4 @@ -103,7 +103,7 @@ } } - + #if DEBUG == 1 fprintf (stderr, "Loading player data.\n"); #endif @@ -147,7 +147,7 @@ if (used) Player[i].tuxfound = SWAP32(tuxfound); else Player[i].tuxfound = 0; } - } + } for (int lev=0; lev nextframe) { nextframe += 10; drawn=false; - + canvasphys(); if (Keyboard.Pressed(SDLK_UP) && !Keyboard.Pressed(SDLK_DOWN) ) { @@ -750,7 +750,7 @@ selection -= levels; mvmbig[mvmbigind++] = 1.0; y += levels*h; - } else { + } else { selection++; mvm[mvmind++] = -1.0; y -= h; @@ -876,7 +876,7 @@ } } -void menu::simulate(Uint32 level, char *replay) { +void menu::simulate(Uint32 level, char *replay) { // Open ghost file @@ -954,7 +954,7 @@ } } - + // Open level file for reading char path1[1200]; @@ -1011,7 +1011,7 @@ while (1) { int i, j, t; float f; - + if (fscanf(dat, "%d.%d=%d,%f\n", &i, &j, &t, &f) != 4) break; switch(t) { case WALL_GROUND: @@ -1133,7 +1133,7 @@ sound::PlayChunk(-1, Media.menuenter, 0); glClearColor(0.225, 0.225, 0.625, 1.00); // background color back to menu's one return; - } + } if (Keyboard.Pressed(SDLK_RETURN) || Keyboard.Pressed(SDLK_SPACE) || Config.nolimit ) { sound::PlayChunk(-1, Media.menuenter, 0); @@ -1150,13 +1150,13 @@ double time = Game.simulate(); glClearColor(0.0, 0.0, 0.0, 1.00); // Want black background - time += 0.001; // Heh heh. - + time += 0.001; // Heh heh. + if (time > 0.005) sprintf (tstr, "%d:%.2d.%.2d", (int)(time/60), (int)(time)%60, (int)(time*100.0)%100); else sprintf(tstr, "FINISHED REPLAY"); nextframe = SDL_GetTicks()+10; - time -= 0.001; // (Heh heh.)^2 + time -= 0.001; // (Heh heh.)^2 focuscanvas(); @@ -1167,7 +1167,7 @@ } } // if pressed - } // while + } // while if (!drawn) { drawn=true; @@ -1396,7 +1396,7 @@ yellow++; } } - + // end of check if (yellow < 3) { message=0; @@ -1427,7 +1427,7 @@ for (int i=1; i0) { char str[200]; - + if (message != MSG_FAILED) { colortime(level, msgtime); } - + if (message==MSG_RECORD) sprintf (str, "TOP SCORE: %d:%.2d.%.2d", (int)(msgtime/60), (int)(msgtime)%60, (int)(msgtime*100.0)%100); - + if (message==MSG_TOPTEN) sprintf (str, "HIGH SCORE: %d:%.2d.%.2d", (int)(msgtime/60), (int)(msgtime)%60, (int)(msgtime*100.0)%100); - + if (message==MSG_TIME) sprintf (str, "%d:%.2d.%.2d", (int)(msgtime/60), (int)(msgtime)%60, (int)(msgtime*100.0)%100); - + if (message==MSG_FAILED) sprintf (str, "YOU FAILED" ); - - + + Font.WriteString(str, Window.width/2-15*strlen(str), Window.height/2+180, 30 ); - + glColor4f(1.0, 1.0, 1.0, 1.0); } @@ -1558,22 +1558,50 @@ } } - -void menu::resolution() { - const int items = 8; - menutext item[items]={ - menutext("*RESOLUTION:"), - menutext("640 X 480"), - menutext("800 X 600"), - menutext("1024 X 768 "), - menutext("1280 X 960 "), - menutext("1280 X 1024"), - menutext(""), - menutext("BACK") - }; - - - int selection=Config.resolution; + +struct Resolution { + int width, height; + char str[64]; +}; +void menu::resolution() { + // Get resolutions + vector resolutions; + SDL_Rect** modes = SDL_ListModes(NULL, SDL_FULLSCREEN|SDL_HWSURFACE|SDL_OPENGL); + if(modes > 0) { + Uint32 bpp = SDL_GetVideoInfo()->vfmt->BitsPerPixel; + for(int i=0; modes[i] && i < 10; ++i) { + Resolution resolution; + resolution.width = modes[i]->w; + resolution.height = modes[i]->h; + + // Menu doesn't fit + if(resolution.width < 800 || resolution.height < 600) continue; + + snprintf(resolution.str, 64, "%d X %d", resolution.width, resolution.height); + resolutions.push_back(resolution); + } + } + + // Form menuitems + vector item; + item.push_back(menutext("*RESOLUTION:")); + for(unsigned int i=0; iw == resolutions[i].width && + SDL_GetVideoSurface()->h == resolutions[i].height) + { + selection = 1 + i; + } + } + for (int i=1; i= 1 && selection <= resolutions.size()) { // Resolution + int width = resolutions[selection-1].width; + int height = resolutions[selection-1].height; + if (!Window.OpenWindow(width, height, 32, flags)) { + fprintf (stderr, "Couldn't set screen mode: %s\n", SDL_GetError()); + exit(1); + } + Config.reswidth = width; + Config.resheight = height; + Graphics.reloadtextures(); + glClearColor(0.225, 0.225, 0.625, 1.00); + return; + } else if (selection == items - 2) { // Full screen / Windowed if (!Window.OpenWindow(Window.width, Window.height, 32, 0) ) { - fprintf (stderr, "Couldn't set screenmode: %s\n", SDL_GetError()); + fprintf (stderr, "Couldn't set screen mode: %s\n", SDL_GetError()); exit(1); } Config.fullscreen = !Config.fullscreen; Graphics.reloadtextures(); - - nextframe = SDL_GetTicks(); - break; - case 7: // back - return; - break; - default: - break; + nextframe = SDL_GetTicks(); + } else if (selection == items - 1) { // Back + return; } - } - if (Keyboard.Pressed(SDLK_ESCAPE)) { sound::PlayChunk(-1, Media.menuenter, 0); return; @@ -1708,10 +1692,10 @@ Graphics.clear(); drawcanvas(); - float y = Window.height/2.0-137; + float y = Window.height/2.0-156; for (int i=0; i 0.005) { colortime(level, Player[Config.currentplayer].times[level][i]); } else glColor4f(1.0, 1.0, 1.0, 1.0); - + Font.WriteString( time2[i], Window.width/2-312+23*s, y, s+0.5 ); Font.WriteString( nick2[i], Window.width/2-312+31*s, y, s+0.5 ); - + glColor4f(1.0, 1.0, 1.0, 1.0); } - + item[0].display(Window.height/2-200); item[1].display(Window.height/2+200); - + glFinish(); SDL_GL_SwapBuffers(); } else SDL_Delay(1); @@ -2583,7 +2567,7 @@ while (!ready) { SDL_Delay(1); - + while (SDL_GetTicks() > nextframe) { nextframe += 10; drawn=false; @@ -2646,7 +2630,7 @@ } // if // drawing section - + if (!drawn) { drawn=true; @@ -2657,9 +2641,9 @@ item[i].display(y); y+=45; } - + drawcanvas(); - + glFinish(); SDL_GL_SwapBuffers(); } else SDL_Delay(1); @@ -2822,7 +2806,7 @@ selection -= levels; mvmbig[mvmbigind++] = 1.0; y += levels*h; - } else { + } else { selection++; mvm[mvmind++] = -1.0; y -= h; @@ -2881,24 +2865,24 @@ drawcanvas(); float y2=y; - + while (y2 > Window.height/2.0-60.0+h/2.0) y2 -= h*(levels+1.0); while (y2 < Window.height/2.0-60.0-h*levels-h/2.0) y2 += h*(levels+1.0); - + for (int i=0; i<50; i++) { float x = mvm[i]; if (x >= 0.02) y2 -= h/2.0*(1-cos(3.14159*x)); if (x <= -0.02) y2 += h/2.0*(1-cos(3.14159*x)); - + x = mvmbig[i]; if (x >= 0.02) y2 -= levels*h/2.0*(1-cos(3.14159*x)); if (x <= -0.02) y2 += levels*h/2.0*(1-cos(3.14159*x)); } - + int yellow=0; - + for (int i=0; i=1 && i<=levelcount) { int w = strlen(list[i-1]); @@ -3048,7 +3032,7 @@ selection -= recordcount; mvmbig[mvmbigind++] = 1.0; y += recordcount*h; - } else { + } else { selection++; mvm[mvmind++] = -1.0; y -= h; @@ -3152,24 +3136,24 @@ while (y2 > Window.height/2.0-60.0+h/2.0) y2 -= h*(recordcount+1.0); while (y2 < Window.height/2.0-60.0-h*recordcount-h/2.0) y2 += h*(recordcount+1.0); - + for (int i=0; i<50; i++) { float x = mvm[i]; if (x >= 0.02) y2 -= h/2.0*(1-cos(3.14159*x)); if (x <= -0.02) y2 += h/2.0*(1-cos(3.14159*x)); - + x = mvmbig[i]; if (x >= 0.02) y2 -= recordcount*h/2.0*(1-cos(3.14159*x)); if (x <= -0.02) y2 += recordcount*h/2.0*(1-cos(3.14159*x)); } - + drawcanvas(); - + for (int i=0; idisplay(); @@ -3500,9 +3484,9 @@ if (!drawn) { drawn=true; - + Graphics.clear(); - + drawcanvas(); float y = Window.height/2.0-40.0; @@ -3519,7 +3503,7 @@ return; } - +/* void menu::netscores() { #if NETWORK == 1 @@ -3610,7 +3594,7 @@ Handler.stop(); #endif } - +*/ void menu::selectmusic(int i) { #if DEBUG == 1 @@ -3722,7 +3706,7 @@ Graphics.clear(); drawcanvas(); - + // volume displays char str[20]; if (Config.musicvol == 10) sprintf (str, "MUSICVOL 10"); @@ -3731,7 +3715,7 @@ if (Config.soundvol == 10) sprintf (str, "SOUNDVOL 10"); else sprintf (str, "SOUNDVOL %d ", Config.soundvol); item[2].settext(str); - + float y = Window.height/2.0-40; for (int i=0; i