r4327 - in packages/trunk/torus-trooper/debian: . patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2007-10-03 21:28:03 +0000 (Wed, 03 Oct 2007)
New Revision: 4327

Added:
   packages/trunk/torus-trooper/debian/patches/level-select-444948.patch
   packages/trunk/torus-trooper/debian/patches/save-score-444372.patch
Modified:
   packages/trunk/torus-trooper/debian/changelog
   packages/trunk/torus-trooper/debian/patches/series
Log:
Save high score when quitting via escape.
Make level selection more intuitive.



Modified: packages/trunk/torus-trooper/debian/changelog
===================================================================
--- packages/trunk/torus-trooper/debian/changelog	2007-10-03 21:15:59 UTC (rev 4326)
+++ packages/trunk/torus-trooper/debian/changelog	2007-10-03 21:28:03 UTC (rev 4327)
@@ -1,3 +1,10 @@
+torus-trooper (0.22.dfsg1-2) UNRELEASED; urgency=low
+
+  * Save high score when quitting via escape (Closes: #444372)
+  * Make level selection more intuitive (Closes: #444948)
+
+ -- Peter De Wachter <pdewacht at gmail.com>  Wed, 03 Oct 2007 23:24:52 +0200
+
 torus-trooper (0.22.dfsg1-1) unstable; urgency=low
 
   * Initial release (Closes: #439684)

Added: packages/trunk/torus-trooper/debian/patches/level-select-444948.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/level-select-444948.patch	                        (rev 0)
+++ packages/trunk/torus-trooper/debian/patches/level-select-444948.patch	2007-10-03 21:28:03 UTC (rev 4327)
@@ -0,0 +1,22 @@
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/title.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/title.d	2007-10-03 00:11:28.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/title.d	2007-10-03 00:12:06.000000000 +0200
+@@ -69,6 +69,7 @@
+       if (dir & (Pad.Dir.RIGHT | Pad.Dir.LEFT)) {
+         if (!dirPressed) {
+           dirPressed = true;
++          int oldGrade = grade;
+           if (dir & Pad.Dir.RIGHT) {
+             grade++;
+             if (grade >= Ship.GRADE_NUM)
+@@ -79,7 +80,8 @@
+             if (grade < 0)
+               grade = Ship.GRADE_NUM - 1;
+           }
+-          if (level > prefManager.prefData.getMaxLevel(grade))
++          if (level == prefManager.prefData.getMaxLevel(oldGrade)
++              || level > prefManager.prefData.getMaxLevel(grade))
+             level = prefManager.prefData.getMaxLevel(grade);
+         }
+       }

Added: packages/trunk/torus-trooper/debian/patches/save-score-444372.patch
===================================================================
--- packages/trunk/torus-trooper/debian/patches/save-score-444372.patch	                        (rev 0)
+++ packages/trunk/torus-trooper/debian/patches/save-score-444372.patch	2007-10-03 21:28:03 UTC (rev 4327)
@@ -0,0 +1,26 @@
+Index: torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d
+===================================================================
+--- torus-trooper-0.22.dfsg1.orig/src/abagames/tt/gamemanager.d	2007-10-02 23:05:33.000000000 +0200
++++ torus-trooper-0.22.dfsg1/src/abagames/tt/gamemanager.d	2007-10-02 23:07:56.000000000 +0200
+@@ -172,6 +172,7 @@
+       if (!escPressed) {
+         escPressed = true;
+         if (state == inGameState) {
++          inGameState.endGame();
+           startTitle();
+         } else {
+           mainLoop.breakLoop();
+@@ -524,6 +525,13 @@
+   public ReplayData replayData() {
+     return _replayData;
+   }
++
++  public void endGame() {
++    if (!ship.isGameOver) {
++      ship.isGameOver = true;
++      prefManager.prefData.recordResult(cast(int) stageManager.level, score);
++    }
++  }
+ }
+ 
+ public class TitleState: GameState {

Modified: packages/trunk/torus-trooper/debian/patches/series
===================================================================
--- packages/trunk/torus-trooper/debian/patches/series	2007-10-03 21:15:59 UTC (rev 4326)
+++ packages/trunk/torus-trooper/debian/patches/series	2007-10-03 21:28:03 UTC (rev 4327)
@@ -5,3 +5,5 @@
 dotfile.patch
 gdc-0.24-semantics-for-version.patch
 window-resizing.patch
+save-score-444372.patch
+level-select-444948.patch