trying to add Id tags in tilemanager files

[supertux.git] / tools / tilemanager / Application.cs

diff --git a/tools/tilemanager/Application.cs b/tools/tilemanager/Application.cs
index a8fe0a9..22fbf8d 100644 (file)
--- a/tools/tilemanager/Application.cs
+++ b/tools/tilemanager/Application.cs
@@ -1,3 +1,4 @@
+//  $Id$
 using System;
 using System.IO;
 using System.Collections;
@@ -93,12 +94,12 @@ public class Application {
        fileChooser.DefaultResponse = Gtk.ResponseType.Ok;
        Gtk.FileFilter filter;
        filter = new Gtk.FileFilter();
-       filter.Name = "Supertux 0.1.x tilesets";
+       filter.Name = "Supertux tilesets";
+       filter.AddPattern("*.strf");
        filter.AddPattern("*.stgt");
        fileChooser.AddFilter( filter );
        filter = new Gtk.FileFilter();
-       filter.Name = "Supertux tilesets";
-       filter.AddPattern("*.strf");
+       filter.Name = "Supertux 0.1.x tilesets";
        filter.AddPattern("*.stgt");
        fileChooser.AddFilter( filter );
        filter = new Gtk.FileFilter();
@@ -169,7 +170,7 @@ public class Application {
                 tile.ID = startid + i;
                 ImageRegion region = new ImageRegion();
                 region.ImageFile = currentimage;
-                region.Region = new System.Drawing.Rectangle(x*32, y*32, 32, 32);
+                region.Region = new System.Drawing.Rectangle(x*TileSet.TILE_WIDTH, y*TileSet.TILE_HEIGHT, TileSet.TILE_WIDTH, TileSet.TILE_HEIGHT);
                 tile.Images.Add(region);
                 if(Tiles[i] != null) {
                     Console.WriteLine(
@@ -191,15 +192,15 @@ public class Application {
         }
         try {
             pixbuf = new Pixbuf(tilesetdir + "/" + file);
-            if(pixbuf.Width % 32 != 0 || pixbuf.Height % 32 != 0)
+            if(pixbuf.Width % TileSet.TILE_WIDTH != 0 || pixbuf.Height % TileSet.TILE_HEIGHT != 0)
                 Console.WriteLine("Warning: Image Width or Height is not a multiple of 32");
         } catch(Exception e) {
             ShowException(e);
             return;
         }
         currentimage = new FileInfo(file).Name;
-        TilesX = pixbuf.Width / 32;
-        TilesY = pixbuf.Height / 32;
+        TilesX = pixbuf.Width / TileSet.TILE_WIDTH;
+        TilesY = pixbuf.Height / TileSet.TILE_HEIGHT;
         SelectionArray = new bool[TilesX * TilesY];
         Tiles = new Tile[TilesX * TilesY];
 
@@ -211,8 +212,8 @@ public class Application {
                 continue;
             ImageRegion region = (ImageRegion) tile.Images[0];
             if(region.ImageFile == currentimage) {
-                int px = region.Region.X / 32;
-                int py = region.Region.Y / 32;
+                int px = region.Region.X / TileSet.TILE_WIDTH;
+                int py = region.Region.Y / TileSet.TILE_HEIGHT;
                 int i = py*TilesX+px;
                 if(i < 0 || i >= Tiles.Length) {
                     Console.WriteLine("Invalid Imageregion at tile " +
@@ -221,7 +222,7 @@ public class Application {
                 }
                 if(Tiles[i] != null) {
                     Console.WriteLine("Multiple tiles for region " +
-                            px*32 + " , " + py*32);
+                            px*TileSet.TILE_WIDTH + " , " + py*TileSet.TILE_HEIGHT);
                     continue;
                 }
                 Tiles[i] = tile;
@@ -373,7 +374,7 @@ public class Application {
     }
 
     private void select(int x, int y) {
-        int tile = y/32 * TilesX + x/32;
+        int tile = y/TileSet.TILE_HEIGHT * TilesX + x/TileSet.TILE_WIDTH;
         if(tile < 0 || tile >= SelectionArray.Length)
             return;
 
@@ -396,15 +397,15 @@ public class Application {
             return;
         foreach(Tile tile in Selection) {
             if(sender == SolidCheckButton)
-                tile.Solid = SolidCheckButton.Active;
+                tile.SetAttribute(Attribute.SOLID, SolidCheckButton.Active);
             if(sender == UniSolidCheckButton)
-                tile.UniSolid = UniSolidCheckButton.Active;
+                tile.SetAttribute(Attribute.UNISOLID, UniSolidCheckButton.Active);
             if(sender == IceCheckButton)
-                tile.Ice = IceCheckButton.Active;
+                tile.SetAttribute(Attribute.ICE, IceCheckButton.Active);
             if(sender == WaterCheckButton)
-                tile.Water = WaterCheckButton.Active;
+                tile.SetAttribute(Attribute.WATER, WaterCheckButton.Active);
             if(sender == SlopeCheckButton)
-                tile.Slope = SlopeCheckButton.Active;
+                tile.SetAttribute(Attribute.SLOPE, SlopeCheckButton.Active);
             if(sender == HiddenCheckButton)
                 tile.Hidden = HiddenCheckButton.Active;
             if(sender == DontUseCheckButton)
@@ -452,11 +453,11 @@ public class Application {
         string nextimage = "";
         foreach(Tile tile in Selection) {
             if(first) {
-                SolidCheckButton.Active = tile.Solid;
-                UniSolidCheckButton.Active = tile.UniSolid;
-                IceCheckButton.Active = tile.Ice;
-                WaterCheckButton.Active = tile.Water;
-                SlopeCheckButton.Active = tile.Slope;
+                SolidCheckButton.Active = tile.HasAttribute(Attribute.SOLID);
+                UniSolidCheckButton.Active = tile.HasAttribute(Attribute.UNISOLID);
+                IceCheckButton.Active = tile.HasAttribute(Attribute.ICE);
+                WaterCheckButton.Active = tile.HasAttribute(Attribute.WATER);
+                SlopeCheckButton.Active = tile.HasAttribute(Attribute.SLOPE);
                 HiddenCheckButton.Active = tile.Hidden;
                 DontUseCheckButton.Active = tile.ID == -1;
                 DataEntry.Text = tile.Data.ToString();