[abe] 19/30: Drop all patches
Markus Koschany
apo at moszumanska.debian.org
Sat Jun 11 10:41:25 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository abe.
commit 7aef6fe5fa388dabfd39020548f8586db628c013
Author: Markus Koschany <apo at debian.org>
Date: Sat Jun 11 10:51:26 2016 +0200
Drop all patches
---
debian/patches/02_enter_keys.diff | 47 --------------
debian/patches/03_truncate_menu.diff | 10 ---
debian/patches/04_default_reso.diff | 19 ------
debian/patches/05_cheat.diff | 83 ------------------------
debian/patches/06_hardening-format-security.diff | 12 ----
debian/patches/series | 5 --
6 files changed, 176 deletions(-)
diff --git a/debian/patches/02_enter_keys.diff b/debian/patches/02_enter_keys.diff
deleted file mode 100644
index 3eff975..0000000
--- a/debian/patches/02_enter_keys.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-Fixes the return/enter key on some keyboards.
-
-
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Editor.c ./src/Editor.c
---- ../orig/abe-1.1/src/Editor.c 2005-03-05 17:20:04.000000000 +0100
-+++ ./src/Editor.c 2007-12-26 11:52:21.000000000 +0100
-@@ -298,6 +298,7 @@
- cursor.dir = DIR_NONE;
- map.redraw = 1;
- break;
-+ case SDLK_KP_ENTER:
- case SDLK_RETURN:
- setImage(edit_panel.level, edit_panel.image_index);
- break;
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Game.c ./src/Game.c
---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100
-+++ ./src/Game.c 2007-12-26 11:51:59.000000000 +0100
-@@ -386,6 +386,7 @@
- game.keys++;
- break;
- #endif
-+ case SDLK_KP_ENTER:
- case SDLK_RETURN:
- if(!game.end_game) {
- if(!game.balloonTimer && game.balloons) {
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Icons.c ./src/Icons.c
---- ../orig/abe-1.1/src/Icons.c 2005-03-05 17:20:04.000000000 +0100
-+++ ./src/Icons.c 2007-12-26 11:52:55.000000000 +0100
-@@ -99,6 +99,7 @@
- icon_selection = -1;
- goto escape;
- case SDLK_SPACE:
-+ case SDLK_KP_ENTER:
- case SDLK_RETURN:
- goto escape;
- case SDLK_LEFT:
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Splash.c ./src/Splash.c
---- ../orig/abe-1.1/src/Splash.c 2005-03-05 17:20:04.000000000 +0100
-+++ ./src/Splash.c 2007-12-26 11:52:38.000000000 +0100
-@@ -40,6 +40,7 @@
- if(menu_y < 0)
- menu_y = FONT_HEIGHT * (GOD_MODE ? 4 : 3);
- break;
-+ case SDLK_KP_ENTER:
- case SDLK_RETURN:
- case SDLK_SPACE:
- map.quit = 1;
diff --git a/debian/patches/03_truncate_menu.diff b/debian/patches/03_truncate_menu.diff
deleted file mode 100644
index 1df68af..0000000
--- a/debian/patches/03_truncate_menu.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../orig/abe-1.1/src/Menu.c 2005-03-05 17:20:04.000000000 +0100
-+++ src/Menu.c 2008-01-24 08:05:59.000000000 +0100
-@@ -21,6 +21,7 @@
- {"audio", 0, {""}, 0},
- {"sound", 2, {"on", "off"}, 0},
- {"music", 2, {"on", "off"}, 0},
-+ {"", 0, {""}, 0}, // truncates the menu here
- {"video", 0, {""}, 0},
- {"full screen", 2, {"on", "off"}, 0},
- {"background", 2, {"on", "off"}, 0},
diff --git a/debian/patches/04_default_reso.diff b/debian/patches/04_default_reso.diff
deleted file mode 100644
index 559996d..0000000
--- a/debian/patches/04_default_reso.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- ../orig/abe-1.1/src/Main.c 2005-03-05 17:20:04.000000000 +0100
-+++ src/Main.c 2008-01-24 11:37:23.000000000 +0100
-@@ -113,6 +113,16 @@
-
- atexit(SDL_Quit);
-
-+ SDL_VideoInfo *vid_info;
-+ vid_info = (SDL_VideoInfo*) SDL_GetVideoInfo ();
-+ if( vid_info )
-+ if( vid_info->current_w == 1440 && vid_info->current_h ==900
-+ || vid_info->current_w == 1400 && vid_info->current_h ==1050 )
-+ {
-+ w = vid_info->current_w;
-+ h = vid_info->current_h;
-+ }
-+
- for(i = 0; i < argc; i++) {
- if(!strcmp(argv[i], "--window")) {
- mainstruct.full_screen = 0;
diff --git a/debian/patches/05_cheat.diff b/debian/patches/05_cheat.diff
deleted file mode 100644
index adb2e55..0000000
--- a/debian/patches/05_cheat.diff
+++ /dev/null
@@ -1,83 +0,0 @@
---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100
-+++ src/Game.c 2008-01-24 10:55:01.000000000 +0100
-@@ -3,6 +3,7 @@
- #include <string.h>
-
- Game game;
-+static int cheat = 0; // 0=no, 1=yes
-
- // path_sprintf should not be used by other .c files, as it does not fit for them.
- static void
-@@ -381,6 +382,17 @@
- case SDLK_d:
- debugMonsters();
- break;
-+ case SDLK_c:
-+ if( event->key.keysym.mod & ( KMOD_CTRL | KMOD_SHIFT | KMOD_ALT ) && getenv( "ABE_IS_CHEATING" ) )
-+ cheat = 1 - cheat;
-+ if( cheat )
-+ {
-+ game.lives = MAX_LIVES;
-+ game.keys = MAX_KEYS;
-+ game.balloons = MAX_BALLOONS;
-+ game.health = MAX_HEALTH;
-+ }
-+ break;
- #if GOD_MODE
- case SDLK_k:
- game.keys++;
-@@ -390,6 +402,7 @@
- if(!game.end_game) {
- if(!game.balloonTimer && game.balloons) {
- playSound(BUBBLE_SOUND);
-+ if( ! cheat )
- game.balloons--;
- game.balloonTimer = BALLOON_RIDE_INTERVAL;
- map.gravity = 0;
-@@ -456,9 +469,11 @@
-
- if(live) {
- showMapStatus(live->monster->name);
-+ if( ! cheat )
- game.health -= (live->monster->damage * (game.difficoulty + 1));
- } else {
- showMapStatus("drowning!");
-+ if( ! cheat )
- game.health--; // water damage
- show_effect = !(game.tick % 40);
- }
-@@ -489,6 +504,7 @@
- if(game.god_mode)
- return;
-
-+ if( ! cheat )
- game.lives--;
-
- // Flash player. Don't move monsters during this.
-@@ -691,6 +707,7 @@
- EMPTY_MAP;
- map.image_index[LEVEL_FORE][key.pos_x + (key.pos_y * map.w)] =
- img_door2;
-+ if( ! cheat )
- game.keys--;
- map.redraw = 1;
- // always return 0 (block) so we don't fall into a door and get stuck there... (was a nasty bug)
-@@ -771,7 +788,7 @@
- game.player_start_y = 28;
- }
-
-- game.lives = 5;
-+ game.lives = MAX_LIVES;
- game.score = 0;
- game.keys = 0;
- game.balloons = 0;
---- ../orig/abe-1.1/src/Game.h 2005-03-05 17:20:04.000000000 +0100
-+++ src/Game.h 2008-01-24 10:45:45.000000000 +0100
-@@ -20,6 +20,7 @@
-
- #define SPRING_JUMP 30
-
-+#define MAX_LIVES 5
- #define MAX_HEALTH 100
-
- // don't hold more than these... mainly b/c the gui can't handle it
diff --git a/debian/patches/06_hardening-format-security.diff b/debian/patches/06_hardening-format-security.diff
deleted file mode 100644
index 3da4e3d..0000000
--- a/debian/patches/06_hardening-format-security.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN -x '*.png' -x '*.jpg' -x '*.ogg' -x '*_image_archive' ../orig/abe-1.1/src/Game.c ./src/Game.c
---- ../orig/abe-1.1/src/Game.c 2005-03-05 17:20:04.000000000 +0100
-+++ ./src/Game.c 2011-09-30 07:48:02.000000000 +0200
-@@ -18,7 +18,7 @@
- len = strlen(path);
-
- if(1 == version) {
-- sprintf(path + len, formatted_name);
-+ sprintf(path + len, "%s", formatted_name);
- } else {
- sprintf(path + len, formatted_name, version);
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6677327..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-02_enter_keys.diff
-03_truncate_menu.diff
-04_default_reso.diff
-05_cheat.diff
-06_hardening-format-security.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/abe.git
More information about the Pkg-games-commits
mailing list