Author: goneri Date: 2009-08-14 23:26:35 +0000 (Fri, 14 Aug 2009) New Revision: 10133
Added: packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff packages/trunk/funnyboat/debian/patches/fullscreen.diff Modified: packages/trunk/funnyboat/debian/changelog packages/trunk/funnyboat/debian/control packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff packages/trunk/funnyboat/debian/patches/series packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff packages/trunk/funnyboat/debian/rules Log: * Fullscreen option - add fullscreen.diff * Fix crash if self.image.set_alpha arg is > int (Closes: #534596) - add avoid_set_alpha_crash.diff * Standards Version: 3.8.2 no changes * Clean up in debian/rules Modified: packages/trunk/funnyboat/debian/changelog =================================================================== --- packages/trunk/funnyboat/debian/changelog 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/changelog 2009-08-14 23:26:35 UTC (rev 10133) @@ -1,3 +1,14 @@ +funnyboat (1.5-8) unstable; urgency=low + + * Fullscreen option + - add fullscreen.diff + * Fix crash if self.image.set_alpha arg is > int (Closes: #534596) + - add avoid_set_alpha_crash.diff + * Standards Version: 3.8.2 no changes + * Clean up in debian/rules + + -- Gonéri Le Bouder <[email protected]> Fri, 14 Aug 2009 22:26:59 +0200 + funnyboat (1.5-7) unstable; urgency=low [ Cyril Brulebois ] Modified: packages/trunk/funnyboat/debian/control =================================================================== --- packages/trunk/funnyboat/debian/control 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/control 2009-08-14 23:26:35 UTC (rev 10133) @@ -5,7 +5,7 @@ Uploaders: Gonéri Le Bouder <[email protected]>, Miriam Ruiz <[email protected]>, Barry deFreese <[email protected]> Build-Depends: debhelper (>= 5.0.37.2), quilt, python Build-Depends-Indep: python-support (>= 0.6), docbook-to-man -Standards-Version: 3.8.1 +Standards-Version: 3.8.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/funnyboat/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/funnyboat/?op=log Homepage: http://funnyboat.sf.net/ Added: packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff =================================================================== --- packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff (rev 0) +++ packages/trunk/funnyboat/debian/patches/avoid_set_alpha_crash.diff 2009-08-14 23:26:35 UTC (rev 10133) @@ -0,0 +1,16 @@ +#534596 +If val is larger than 'int', image.set_alpha throw an exception. set_alpha +argument is supposed to be < 256. +--- funnyboat-1.5.orig/particles.py ++++ funnyboat-1.5/particles.py +@@ -24,7 +24,9 @@ + pygame.draw.ellipse(self.image, self.colour, self.image.get_rect()) + + if Variables.alpha: +- self.image.set_alpha(self.life * 255 * self.opacity / self.initial_life) ++ val = self.life * 255 * self.opacity / self.initial_life ++ if val < 256: ++ self.image.set_alpha(val) + + def update(self): + self.rect.left += self.vect[0] Added: packages/trunk/funnyboat/debian/patches/fullscreen.diff =================================================================== --- packages/trunk/funnyboat/debian/patches/fullscreen.diff (rev 0) +++ packages/trunk/funnyboat/debian/patches/fullscreen.diff 2009-08-14 23:26:35 UTC (rev 10133) @@ -0,0 +1,83 @@ +Add fullscreen support +Gonéri Le Bouder <[email protected]> +--- funnyboat-1.5.orig/locals.py ++++ funnyboat-1.5/locals.py +@@ -6,7 +6,6 @@ + MIN_FIRE_DELAY = 10 + SCREEN_WIDTH = 400#320 + SCREEN_HEIGHT = 300#240 +-SCREEN_FULLSCREEN = 0 + FPS = 30 + + +@@ -17,3 +16,4 @@ + sound = True + music = True + name = "Funny Boater" ++ fullscreen = True +--- funnyboat-1.5.orig/util.py ++++ funnyboat-1.5/util.py +@@ -62,6 +62,8 @@ + Variables.sound = str_to_bool(value) + elif variable == "aa": + Variables.aa = str_to_bool(value) ++ elif variable == "fullscreen": ++ Variables.fullscreen = str_to_bool(value) + + f.close() + +@@ -77,6 +79,7 @@ + print >> f, "name\t%s" % Variables.name + print >> f, "sound\t%s" % Variables.sound + print >> f, "aa\t%s" % Variables.aa ++ print >> f, "fullscreen\t%s" % Variables.fullscreen + + f.close() + +--- funnyboat-1.5.orig/options.py ++++ funnyboat-1.5/options.py +@@ -14,6 +14,7 @@ + SOUND = 2 + MUSIC = 3 + NAME = 4 ++ FULLSCREEN = 5 + + def __init__(self, screen): + self.screen = screen +@@ -39,7 +40,8 @@ + "Antialiasing: " + (Variables.aa and "on" or "off"), + "Sound effects: " + (Variables.sound and "on" or "off"), + "Music: " + (Variables.music and "on" or "off"), +- "Player Name: " + Variables.name) ++ "Player Name: " + Variables.name, ++ "Fullscreen: " + (Variables.fullscreen and "on" or "off")) + + def run(self): + done = False +@@ -138,6 +140,10 @@ + pygame.mixer.music.stop() + except: + pass ++ elif self.selection == Options.FULLSCREEN: ++ Variables.fullscreen = not Variables.fullscreen ++ pygame.display.toggle_fullscreen() ++ + self.refresh() + + def change_right(self): +--- funnyboat-1.5.orig/main.py ++++ funnyboat-1.5/main.py +@@ -53,10 +53,10 @@ + elif arg == "-ns": + Variables.sound = False + elif arg == "-f": +- SCREEN_FULLSCREEN = True ++ Variables.fullscreen = True + + scr_options = 0 +- if SCREEN_FULLSCREEN: scr_options += FULLSCREEN ++ if Variables.fullscreen: scr_options += FULLSCREEN + screen = pygame.display.set_mode((SCREEN_WIDTH, SCREEN_HEIGHT),scr_options ,32) + + pygame.display.set_icon(util.load_image("kuvake")) + Modified: packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff =================================================================== --- packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/patches/save-sshot-in-homedir.diff 2009-08-14 23:26:35 UTC (rev 10133) @@ -1,3 +1,4 @@ +Author: Gonéri Le Bouder <[email protected]> Index: game.py =================================================================== --- a/game.py Modified: packages/trunk/funnyboat/debian/patches/series =================================================================== --- packages/trunk/funnyboat/debian/patches/series 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/patches/series 2009-08-14 23:26:35 UTC (rev 10133) @@ -1,3 +1,5 @@ save-sshot-in-homedir.diff use_debian_vera_ttf.diff funnyboat-cursor-patch.diff +fullscreen.diff +avoid_set_alpha_crash.diff Modified: packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff =================================================================== --- packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/patches/use_debian_vera_ttf.diff 2009-08-14 23:26:35 UTC (rev 10133) @@ -1,3 +1,4 @@ +Author: Gonéri Le Bouder <[email protected]> Index: util.py =================================================================== --- a/util.py Modified: packages/trunk/funnyboat/debian/rules =================================================================== --- packages/trunk/funnyboat/debian/rules 2009-08-14 08:39:59 UTC (rev 10132) +++ packages/trunk/funnyboat/debian/rules 2009-08-14 23:26:35 UTC (rev 10133) @@ -1,6 +1,4 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
