[berusky] 05/17: Drop 04-unfinished.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository berusky.

commit 1415a2c61a2be819f5c8693e34ef54caee8f9cd2
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 8 15:34:35 2017 +0200

    Drop 04-unfinished.patch
---
 debian/patches/04-unfinished.patch | 115 -------------------------------------
 debian/patches/series              |   1 -
 2 files changed, 116 deletions(-)

diff --git a/debian/patches/04-unfinished.patch b/debian/patches/04-unfinished.patch
deleted file mode 100644
index 6d40ef3..0000000
--- a/debian/patches/04-unfinished.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 12 Jun 2016 11:23:10 +0200
-Subject: 04 unfinished
-
----
- README              |  2 --
- po/berusky.pot      |  8 --------
- src/berusky_gui.cpp |  4 ----
- src/main.cpp        | 12 ------------
- src/main.h          |  1 -
- 5 files changed, 27 deletions(-)
-
-diff --git a/README b/README
-index 9fef3e6..58d40da 100644
---- a/README
-+++ b/README
-@@ -98,8 +98,6 @@
-   4            - Choose the fourth bug
-   5            - Choose the fifth bug
- 
--  N            - change the music (not implemented yet)
--  D            - start recording a demo (not implemented yet)
-   CTRL+X       - quit quickly
- 
-   F1           - In game help
-diff --git a/po/berusky.pot b/po/berusky.pot
-index fbc640d..0cf855f 100644
---- a/po/berusky.pot
-+++ b/po/berusky.pot
-@@ -1075,14 +1075,6 @@ msgstr ""
- msgid ". . . . . . . switch among the bugs"
- msgstr ""
- 
--#: ../src/berusky_gui.cpp:1072
--msgid ". . . . . . . . change the music"
--msgstr ""
--
--#: ../src/berusky_gui.cpp:1073
--msgid ". . . . . . . . demo"
--msgstr ""
--
- #: ../src/berusky_gui.cpp:1074
- msgid ". . . . . . quit quickly"
- msgstr ""
-diff --git a/src/berusky_gui.cpp b/src/berusky_gui.cpp
-index 71b97c6..78ffb66 100644
---- a/src/berusky_gui.cpp
-+++ b/src/berusky_gui.cpp
-@@ -1058,8 +1058,6 @@ which can be controlled by these keys:"));
-         p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("SHIFT+arrows"));
-         
-         p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("Tab"));
--        p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("N"));
--        p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("D"));
-         p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("CTRL+X"));
-         p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("F1"));
-         p_font->print(NULL, X_START+20,  start_y += Y_DIFF, _("F2"));
-@@ -1069,8 +1067,6 @@ which can be controlled by these keys:"));
-         p_font->print(NULL, X_START+135,  start_y, _(". . . . . move the bug"));
-         p_font->print(NULL, X_START+205,  start_y += Y_DIFF, _(". . quick bug movement"));
-         p_font->print(NULL, X_START+86,  start_y += Y_DIFF, _(". . . . . . . switch among the bugs"));
--        p_font->print(NULL, X_START+60,  start_y += Y_DIFF, _(". . . . . . . . change the music"));
--        p_font->print(NULL, X_START+60,  start_y += Y_DIFF, _(". . . . . . . . demo"));
-         p_font->print(NULL, X_START+110, start_y += Y_DIFF, _(". . . . . . quit quickly"));
-         p_font->print(NULL, X_START+60,  start_y += Y_DIFF, _(". . . . . . . . Help"));
-         p_font->print(NULL, X_START+60,  start_y += Y_DIFF, _(". . . . . . . . Save level"));
-diff --git a/src/main.cpp b/src/main.cpp
-index 85fad96..1de19c8 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -144,11 +144,6 @@ void run_game(GAME_MODE gmode, char *p_garg, DIR_LIST *p_dir)
-       main_queue.add(LEVEL_EVENT(GC_RUN_LEVEL_LINE, p_garg));
-       break;
-     
--    /* Run demo */
--    case USER_DEMO:
--      //main_queue.add(LEVEL_EVENT(GC_RUN_LEVEL_LINE, p_garg));
--      break;
--    
-     /* WTF? */
-     default:
-       assert(0);
-@@ -305,12 +300,6 @@ int main(int argc, char *argv[])
-     gmode = USER_LEVEL;
-     p_garg = argv[2];
-   }
--  /* Run demo */
--  else if(argc > 2 && (argv[1][0] != '-' || argv[1][1] == 'd'))
--  {
--    gmode = USER_DEMO;
--    p_garg = argv[2];
--  }
-   /* Run normal game from menu */
-   else if(argc == 1)
-   {
-@@ -338,7 +327,6 @@ int main(int argc, char *argv[])
- void start_logo_draw(GAME_MODE mode)
- {
-   switch(mode) {  
--    case USER_DEMO:
-     case USER_LEVEL:
-     case MENU:
-       {
-diff --git a/src/main.h b/src/main.h
-index 113ef4a..50015cc 100644
---- a/src/main.h
-+++ b/src/main.h
-@@ -31,7 +31,6 @@
- typedef enum game_mode {
- 
-   USER_LEVEL,
--  USER_DEMO,
-   MENU,
-   EDITOR
- 
diff --git a/debian/patches/series b/debian/patches/series
index c554600..61da4d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-04-unfinished.patch
 05-no-editor.patch
 11-german-po.patch
 12-locale.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/berusky.git