[gnome-nibbles] Bug 733461, remove level 25 teleporter

[Bryan Quigley <bryanquigs src gnome org>]

commit d63375289d855d0cfd34be86bec59c6a604434a6
Author: Bryan Quigley <bryanquigs src gnome org>
Date:   Sun Jul 20 16:55:00 2014 -0400

    Bug 733461, remove level 25 teleporter

 data/levels/level025.gnl |    2 +-
 src/board.c              |    2 --
 src/warpmanager.c        |   22 ++--------------------
 3 files changed, 3 insertions(+), 23 deletions(-)
---
diff --git a/data/levels/level025.gnl b/data/levels/level025.gnl
index d301029..0aa24e8 100644
--- a/data/levels/level025.gnl
+++ b/data/levels/level025.gnl
@@ -31,7 +31,7 @@ baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaabaabaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaa
 baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaigaafgafgaafjaaigaafgafgaafjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
 baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadhccheadhccheaadhccheadhccheaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
 baaaaaaaaaaaaaoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamaaaaaaaaaaab
-baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
+baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
 baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafkcckgafkcckgaafkcckgafkcckgaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
 baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaieaadeadeaadjaaieaadeadeaadjaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
 baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabaaaaaaaaaaabaabaaaaaaaaaaabaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab
diff --git a/src/board.c b/src/board.c
index ea6f6f6..5b30447 100644
--- a/src/board.c
+++ b/src/board.c
@@ -297,8 +297,6 @@ gnibbles_board_level_new (GnibblesBoard *board, gint level)
             gnibbles_worm_set_start (worms[count++], j, i, WORMRIGHT);
           break;
         case 'Q':
-          gnibbles_warpmanager_add_warp (warpmanager, j - 1, i - 1, -1, -1);
-          break;
         case 'R':
         case 'S':
         case 'T':
diff --git a/src/warpmanager.c b/src/warpmanager.c
index 4aeea88..e75bb1d 100644
--- a/src/warpmanager.c
+++ b/src/warpmanager.c
@@ -129,20 +129,11 @@ gnibbles_warpmanager_worm_change_pos (GnibblesWarpManager * warpmanager,
         (worm->xhead == warpmanager->warps[i]->x + 1 &&
         worm->yhead == warpmanager->warps[i]->y + 1)) {
 
-      if (warpmanager->warps[i]->wx == -1) {
-         good = 0;
-        while (!good) {
-          x = rand () % BOARDWIDTH;
-          y = rand () % BOARDHEIGHT;
-          if (board->walls[x][y] == EMPTYCHAR)
-            good = 1;
-        }
-      } else {
         x = warpmanager->warps[i]->wx;
         y = warpmanager->warps[i]->wy;
         if (board->walls[x][y] != EMPTYCHAR)
           gnibbles_boni_remove_bonus (boni, x, y);
-      }
+
       //reset warps
       board->walls
         [warpmanager->warps[i]->x][warpmanager->warps[i]->y] = WARPLETTER;
@@ -175,20 +166,11 @@ gnibbles_warpmanager_worm_change_tail_pos (GnibblesWarpManager * warpmanager,
         (worm->xtail == warpmanager->warps[i]->x + 1 &&
         worm->ytail == warpmanager->warps[i]->y + 1)) {
 
-      if (warpmanager->warps[i]->wx == -1) {
-         good = 0;
-        while (!good) {
-          x = rand () % BOARDWIDTH;
-          y = rand () % BOARDHEIGHT;
-          if (board->walls[x][y] == EMPTYCHAR)
-            good = 1;
-        }
-      } else {
         x = warpmanager->warps[i]->wx;
         y = warpmanager->warps[i]->wy;
         if (board->walls[x][y] != EMPTYCHAR)
           gnibbles_boni_remove_bonus (boni, x, y);
-      }
+
       //reset warps
       board->walls
         [warpmanager->warps[i]->x][warpmanager->warps[i]->y] = WARPLETTER;