[Super-tux-commit] supertux/contrib/tilemanager Application.cs,1.4,1.5 Parser.cs,1.1,1.2 Tile.cs,1.3,1.4 tiler.glade,1.1,1.2

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/contrib/tilemanager
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25154/contrib/tilemanager

Modified Files:
	Application.cs Parser.cs Tile.cs tiler.glade 
Log Message:
fix some more timings and the long standing gradient software bug (which was function argument overriding class field)

Index: Application.cs
===================================================================
RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Application.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Application.cs	22 Nov 2004 17:51:50 -0000	1.4
+++ Application.cs	23 Nov 2004 02:00:29 -0000	1.5
@@ -26,7 +26,7 @@
     [Glade.Widget]
     private Gtk.Entry DataEntry;
     [Glade.Widget]
-    private Gtk.Entry AnimSpeedEntry;
+    private Gtk.Entry AnimFpsEntry;
     [Glade.Widget]                 
     private Gtk.Entry IDEntry;
     [Glade.Widget]
@@ -342,8 +342,8 @@
                     tile.ID = Int32.Parse(IDEntry.Text);
                 if(sender == DataEntry)
                     tile.Data = Int32.Parse(DataEntry.Text);
-                if(sender == AnimSpeedEntry)
-                    tile.AnimSpeed = Int32.Parse(AnimSpeedEntry.Text);
+                if(sender == AnimFpsEntry)
+                    tile.AnimFps = Single.Parse(AnimFpsEntry.Text);
             } catch(Exception exception) {
                 // ignore parse errors for now...
             }
@@ -380,7 +380,7 @@
                 SlopeCheckButton.Active = tile.Slope;
                 DontUseCheckButton.Active = tile.ID == -1;
                 DataEntry.Text = tile.Data.ToString();
-                AnimSpeedEntry.Text = tile.AnimSpeed.ToString();
+                AnimFpsEntry.Text = tile.AnimFps.ToString();
                 IDEntry.Text = tile.ID.ToString();
                 IDEntry.Editable = true;
                 first = false;

Index: Parser.cs
===================================================================
RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Parser.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Parser.cs	22 Nov 2004 01:49:43 -0000	1.1
+++ Parser.cs	23 Nov 2004 02:00:29 -0000	1.2
@@ -85,6 +85,9 @@
     public bool BoolValue {
         get { return StringValue == "t" ? true : false; }
     }
+    public float FloatValue {
+        get { return Single.Parse(lexer.TokenString); }
+    }
 }
 
 }

Index: Tile.cs
===================================================================
RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/Tile.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Tile.cs	22 Nov 2004 02:09:52 -0000	1.3
+++ Tile.cs	23 Nov 2004 02:00:29 -0000	1.4
@@ -23,14 +23,14 @@
     public bool Goal;
     public int NextTile;
     public int Data;
-    public int AnimSpeed;
+    public float AnimFps;
     public string EditorImage;
     public ArrayList Images = new ArrayList();
 
     public Tile() {
         ID = -1;
         NextTile = -1;
-        AnimSpeed = 25;
+        AnimFps = 1;
     }
 
     public void Write(LispWriter writer) {
@@ -82,8 +82,11 @@
             writer.Write("editor-images", EditorImage);
         if(Data != 0)
             writer.Write("data", Data);
-        if(AnimSpeed != 25)
-            writer.Write("anim-speed", AnimSpeed);
+        if(Images.Count > 1) {
+            if(AnimFps == 1.0)
+              AnimFps = 40;
+            writer.Write("anim-fps", AnimFps);
+        }
         writer.EndList("tile");
     }
 
@@ -121,8 +124,8 @@
                         Slope = true;
                         Data = parser.IntegerValue;
                         break;
-                    case "anim-speed":
-                        AnimSpeed = parser.IntegerValue;
+                    case "anim-fps":
+                        AnimFps = parser.FloatValue;
                         break;
                     case "spike":
                         Spike = parser.BoolValue;

Index: tiler.glade
===================================================================
RCS file: /cvsroot/super-tux/supertux/contrib/tilemanager/tiler.glade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tiler.glade	22 Nov 2004 01:49:43 -0000	1.1
+++ tiler.glade	23 Nov 2004 02:00:29 -0000	1.2
@@ -471,7 +471,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="label4">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">AnimSpeed:</property>
+		      <property name="label" translatable="yes">AnimFPS:</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -493,7 +493,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkEntry" id="AnimSpeedEntry">
+		    <widget class="GtkEntry" id="AnimFpsEntry">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>