r14118 - packages/trunk/titanion/debian/patches

[Peter De Wachter]

Author: pdewacht-guest
Date: 2013-05-21 19:38:08 +0000 (Tue, 21 May 2013)
New Revision: 14118

Modified:
   packages/trunk/titanion/debian/patches/dlang_v2.patch
Log:
titanion: fixes for GDC 4.8


Modified: packages/trunk/titanion/debian/patches/dlang_v2.patch
===================================================================
--- packages/trunk/titanion/debian/patches/dlang_v2.patch	2013-05-21 19:32:22 UTC (rev 14117)
+++ packages/trunk/titanion/debian/patches/dlang_v2.patch	2013-05-21 19:38:08 UTC (rev 14118)
@@ -1285,27 +1285,34 @@
      try {
        mkdir(dir);
      } catch (FileException e) {
-@@ -39,7 +40,7 @@
+@@ -39,9 +40,8 @@
  
  
    public void load() {
 -    auto File fd = null;
-+    scope File fd = null;
      try {
-       fd = new File(pref_dir() ~ "/" ~ PREF_FILE_NAME, FileMode.In);
+-      fd = new File(pref_dir() ~ "/" ~ PREF_FILE_NAME, FileMode.In);
++      scope File fd = new File(pref_dir() ~ "/" ~ PREF_FILE_NAME, FileMode.In);
        int ver;
-@@ -50,7 +51,7 @@
+       fd.read(ver);
+       if (ver != VERSION_NUM)
+@@ -50,12 +50,8 @@
        for(int j = 0; j < MODE_NUM; j++)
          for(int i = 0; i < RANKING_NUM; i++)
            fd.read(_highScore[j][i]);
 -    } catch (Object e) {
 +    } catch (Throwable e) {
        init();
-     } finally {
-       if (fd)
-@@ -67,7 +68,7 @@
+-    } finally {
+-      if (fd)
+-        if (fd.isOpen())
+-          fd.close();
+     }
    }
  
+@@ -67,7 +63,7 @@
+   }
+ 
    public void save() {
 -    auto File fd = new File(pref_dir() ~ "/" ~ PREF_FILE_NAME, FileMode.OutNew);
 +    scope File fd = new File(pref_dir() ~ "/" ~ PREF_FILE_NAME, FileMode.OutNew);
@@ -1451,7 +1458,7 @@
        if (seMark[key]) {
          se[key].play();
          seMark[key] = false;
-@@ -118,8 +118,8 @@
+@@ -118,16 +118,16 @@
    }
  
    public static void clearMarkedSes() {
@@ -1462,6 +1469,16 @@
        seMark[key] = false;
    }
  
+   public static void bgmEnabled(bool v) {
+-    return _bgmEnabled = v;
++    _bgmEnabled = v;
+   }
+ 
+   public static void seEnabled(bool v) {
+-    return _seEnabled = v;
++    _seEnabled = v;
+   }
+ }
 --- a/src/abagames/ttn/stage.d
 +++ b/src/abagames/ttn/stage.d
 @@ -202,7 +202,7 @@
@@ -2030,3 +2047,15 @@
      PadState s = super.getState();
      if (doRecord)
        record(s);
+--- a/src/abagames/ttn/field.d
++++ b/src/abagames/ttn/field.d
+@@ -19,8 +19,8 @@
+ public class Field {
+  public:
+   static const float PIT_SIZE_Y_RATIO = 12.0f;
+- private:
+   static const float CIRCLE_RADIUS = 64.0f;
++ private:
+   static const float EYE_POS_DIST_RATIO = 1.25f;
+   static const float X_EXPANSION_RATIO = 1.0f;
+   static const float SIDEWALL_WIDTH = 145;