r9439 - in packages/trunk/hex-a-hop/debian: . patches
Barry deFreese
bdefreese at alioth.debian.org
Mon Apr 6 19:19:16 UTC 2009
Author: bdefreese
Date: 2009-04-06 19:19:16 +0000 (Mon, 06 Apr 2009)
New Revision: 9439
Added:
packages/trunk/hex-a-hop/debian/patches/remove_confirmation.patch
Modified:
packages/trunk/hex-a-hop/debian/changelog
packages/trunk/hex-a-hop/debian/control
packages/trunk/hex-a-hop/debian/patches/series
Log:
* Add myself to uploaders.
* remove_confirmation.patch - Remove confirmation window on exit.
+ Thanks to Bas Winjen. (Closes: #441528).
* Bump Standards Version to 3.8.1. (No changes needed).
Refresh changelog.
Modified: packages/trunk/hex-a-hop/debian/changelog
===================================================================
--- packages/trunk/hex-a-hop/debian/changelog 2009-04-06 18:22:50 UTC (rev 9438)
+++ packages/trunk/hex-a-hop/debian/changelog 2009-04-06 19:19:16 UTC (rev 9439)
@@ -1,4 +1,4 @@
-hex-a-hop (0.0.20070315-7) UNRELEASED; urgency=low
+hex-a-hop (0.0.20070315-7) unstable; urgency=low
[ Jens Seidel ]
* Added Japanese translation of desktop file. Thanks to Kobayashi
@@ -15,8 +15,14 @@
[ Ansgar Burchardt ]
* Remove Homepage semi-field from description
- -- Jens Seidel <jensseidel at users.sf.net> Mon, 17 Dec 2007 16:30:00 +0200
+ [ Barry deFreese ]
+ * Add myself to uploaders.
+ * remove_confirmation.patch - Remove confirmation window on exit.
+ + Thanks to Bas Winjen. (Closes: #441528).
+ * Bump Standards Version to 3.8.1. (No changes needed).
+ -- Barry deFreese <bdefreese at debian.org> Mon, 06 Apr 2009 14:33:29 -0400
+
hex-a-hop (0.0.20070315-6) unstable; urgency=low
[Jens Seidel]
Modified: packages/trunk/hex-a-hop/debian/control
===================================================================
--- packages/trunk/hex-a-hop/debian/control 2009-04-06 18:22:50 UTC (rev 9438)
+++ packages/trunk/hex-a-hop/debian/control 2009-04-06 19:19:16 UTC (rev 9439)
@@ -2,9 +2,9 @@
Section: games
Priority: optional
Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Jens Seidel <jensseidel at users.sf.net>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Jens Seidel <jensseidel at users.sf.net>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Barry deFreese <bdefreese at debian.org>
Build-Depends: debhelper (>= 5), quilt, gettext, libsdl1.2-dev, libsdl-pango-dev, po4a
-Standards-Version: 3.7.2
+Standards-Version: 3.8.1
Homepage: http://www.aceinternet.co.uk/~mokona/
Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hex-a-hop/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/hex-a-hop/?op=log
Added: packages/trunk/hex-a-hop/debian/patches/remove_confirmation.patch
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/remove_confirmation.patch (rev 0)
+++ packages/trunk/hex-a-hop/debian/patches/remove_confirmation.patch 2009-04-06 19:19:16 UTC (rev 9439)
@@ -0,0 +1,191 @@
+Index: hex-a-hop-0.0.20070315/menus.h
+===================================================================
+--- hex-a-hop-0.0.20070315.orig/menus.h 2009-04-06 14:39:44.000000000 -0400
++++ hex-a-hop-0.0.20070315/menus.h 2009-04-06 14:48:32.000000000 -0400
+@@ -70,7 +70,7 @@
+ virtual void Mouse(int /*x*/, int /*y*/, int /*dx*/, int /*dy*/, int buttons_pressed, int /*buttons_released*/, int /*buttons*/)
+ {
+ if (buttons_pressed==4 || buttons_pressed==2)
+- Cancel();
++ Pop();
+ }
+
+ virtual void Move(int /*dir*/) {}
+@@ -310,7 +310,7 @@
+ HintMessage::GetOuterWindowRect().h)
+ Move(1);
+ else
+- Cancel();
++ Pop();
+ }
+ else if (buttons_pressed==8)
+ Move(-1);
+@@ -399,8 +399,6 @@
+ OPT_FULLSCREEN,
+ OPT_OPTIONS,
+ OPT_QUIT,
+- OPT_QUIT_CONFIRM,
+- OPT_QUIT_CANCEL,
+ OPT_QUIT_MENU_CONFIRM,
+ OPT_HELP,
+ OPT_GAMESLOT_NEW,
+@@ -432,8 +430,6 @@
+ _("Toggle Fullscreen"),
+ _("Options"),
+ _("Quit"),
+- _("Yes"),
+- _("No"),
+ _("Return to Title"),
+ _("Help"),
+ _("Start New Game"),
+@@ -1014,20 +1010,7 @@
+ #endif
+ }
+ bool KeyPressed(int key, int mod);
+-};
+-
+-struct QuitConfirmMenu : public OptMenuTitle
+-{
+- QuitConfirmMenu() : OptMenuTitle(_("Quit: Are you sure?"))
+- {
+- opt[num_opt++] = OPT_QUIT_CONFIRM;
+- opt[select=num_opt++] = OPT_QUIT_CANCEL;
+- Init();
+-
+- r.y += FONT_SPACING*1;
+- r2.y += FONT_SPACING*2;
+- }
+-
++ void Cancel ();
+ };
+
+ struct DeleteConfirmMenu : public OptMenuTitle
+@@ -1061,25 +1044,12 @@
+ }
+ };
+
+-bool TitleMenu::KeyPressed(int key, int mod)
+-{
+- if (key==SDLK_DELETE || key==SDLK_BACKSPACE || key==SDLK_F2)
+- {
+- if (select<0 || select>=num_opt || opt[select]<OPT_GAMESLOT_0 || opt[select]>OPT_GAMESLOT_LAST)
+- return true;
+- int i = opt[select] - OPT_GAMESLOT_0;
+-
+- new DeleteConfirmMenu(i);
+-
+- return true;
+- }
+- return OptMenu::KeyPressed(key, mod);
+-}
+-
+ struct PauseMenu : public OptMenu
+ {
++ bool escape_to_map;
+ PauseMenu(bool isMap, bool allowGotoMap, int allowEnd, int allowEnd2) : OptMenu(_("Paused"))
+ {
++ escape_to_map = !isMap && allowGotoMap;
+ opt[num_opt++] = OPT_RESUME;
+ if (!isMap)
+ opt[num_opt++] = OPT_RESTART;
+@@ -1087,19 +1057,19 @@
+ opt[num_opt++] = OPT_HELP;
+ if (allowEnd || allowEnd2)
+ opt[num_opt++] = allowEnd2 ? OPT_END2 : OPT_END;
+- opt[num_opt++] = (isMap || !allowGotoMap) ? OPT_QUIT_MENU_CONFIRM : OPT_GOTO_MAP;
++ opt[num_opt++] = escape_to_map ? OPT_GOTO_MAP : OPT_QUIT_MENU_CONFIRM;
+ Init();
+ }
+ virtual bool KeyPressed(int key, int mod)
+ {
+ if (key=='p' || key==SDLK_PAUSE)
+ {
+- Cancel();
++ Pop();
+ return true;
+ }
+ return Menu::KeyPressed(key, mod);
+ }
+-
++ void Cancel ();
+ };
+
+ struct OptionMenu : public OptMenuTitle
+@@ -1182,12 +1152,38 @@
+ }
+ };
+
++bool TitleMenu::KeyPressed(int key, int mod)
++{
++ if (key==SDLK_DELETE || key==SDLK_BACKSPACE || key==SDLK_F2)
++ {
++ if (select<0 || select>=num_opt || opt[select]<OPT_GAMESLOT_0 || opt[select]>OPT_GAMESLOT_LAST)
++ return true;
++ int i = opt[select] - OPT_GAMESLOT_0;
++
++ new DeleteConfirmMenu(i);
++
++ return true;
++ }
++ return OptMenu::KeyPressed(key, mod);
++}
++
++void TitleMenu::Cancel ()
++{
++ new Fader (-1, -2);
++}
++
+ void Ending::Cancel()
+ {
+ new Fader(-1, -6, 0.3);
+ // Pop();
+ }
+
++void PauseMenu::Cancel ()
++{
++ opt[select] = escape_to_map ? OPT_GOTO_MAP : OPT_QUIT_MENU_CONFIRM;
++ Select ();
++}
++
+ void ToggleFullscreen();
+
+ void OptMenu::Select()
+@@ -1197,11 +1193,11 @@
+ switch(opt[select])
+ {
+ case OPT_RESUME:
+- Cancel();
++ Pop();
+ break;
+
+ case OPT_RESTART:
+- Cancel();
++ Pop();
+ HackKeyPress('r', KMOD_CTRL);
+ break;
+
+@@ -1211,15 +1207,11 @@
+ HackKeyPress(SDLK_ESCAPE, KMOD_CTRL);
+ break;
+
+- case OPT_QUIT:
+- new QuitConfirmMenu();
+- break;
+-
+ case OPT_FULLSCREEN:
+ ToggleFullscreen();
+ break;
+
+- case OPT_QUIT_CONFIRM:
++ case OPT_QUIT:
+ new Fader(-1, -2);
+ break;
+
+@@ -1236,7 +1228,6 @@
+ new HintReview();
+ break;
+
+- case OPT_QUIT_CANCEL:
+ case OPT_BACK:
+ Pop();
+ break;
Modified: packages/trunk/hex-a-hop/debian/patches/series
===================================================================
--- packages/trunk/hex-a-hop/debian/patches/series 2009-04-06 18:22:50 UTC (rev 9438)
+++ packages/trunk/hex-a-hop/debian/patches/series 2009-04-06 19:19:16 UTC (rev 9439)
@@ -14,3 +14,4 @@
reduce_cpu_usage.patch
mouse-wheel-support.patch
segfault_443822.patch
+remove_confirmation.patch
More information about the Pkg-games-commits
mailing list