Changeset 419Tweet

Timestamp:

Feb 7, 2011, 2:40:30 PM (12 years ago)

Author:

sam

Message:

Name tilers, samples and pieces for easier debugging.

Location:

trunk

Files:

• monsterz/piece.cpp (modified) (2 diffs)
• monsterz/piece.h (modified) (1 diff)
• src/dict.cpp (modified) (1 diff)
• src/sample.cpp (modified) (2 diffs)
• src/tileset.cpp (modified) (2 diffs)

trunk/monsterz/piece.cpp

@@ -49 +49 @@
     }
     state;
+
+    char namebuf[40];
 };
 
@@ -87 +89 @@
 
     data->pos = data->cell * data->size;
+}
+
+char const *Piece::GetName()
+{
+    sprintf(data->namebuf, "<piece> %ix%i @ %i,%i",
+            data->size.x, data->size.y, data->cell.x, data->cell.y);
+    return data->namebuf;
 }
 

trunk/monsterz/piece.h

@@ -34 +34 @@
     virtual ~Piece();
 
+    virtual char const *GetName();
+
     void SetCell(int2 cell);
     int2 GetCell() const;

trunk/src/dict.cpp

@@ -78 +78 @@
         if (!e)
             empty = id;
-        else if (!strcasecmp(name, e->GetName()))
-            break;
+        else
+        {
+            char const *oldname = e->GetName();
+            if (*oldname == '<')
+            {
+                while (*oldname && *oldname != '>')
+                    oldname++;
+                while (*oldname == '>')
+                    oldname++;
+                while (*oldname == ' ')
+                    oldname++;
+            }
+
+            if (!strcasecmp(name, oldname))
+                break;
+        }
     }
 

trunk/src/sample.cpp

@@ -30 +30 @@
 
 private:
-    char *name;
+    char *name, *path;
     Mix_Chunk *chunk;
 };
@@ -41 +41 @@
   : data(new SampleData())
 {
-    data->name = strdup(path);
+    data->name = (char *)malloc(9 + strlen(path) + 1);
+    data->path = data->name + 9;
+    sprintf(data->name, "<sample> %s", path);
+
     data->chunk = Mix_LoadWAV(path);
     if (!data->chunk)

trunk/src/tileset.cpp

@@ -41 +41 @@
 
 private:
-    char *name;
+    char *name, *path;
     int *tiles;
     int w, h, nw, nh, ntiles;
@@ -57 +57 @@
   : data(new TileSetData())
 {
-    data->name = strdup(path);
+    data->name = (char *)malloc(10 + strlen(path) + 1);
+    data->path = data->name + 10;
+    sprintf(data->name, "<tileset> %s", path);
+
     data->tiles = NULL;
     data->img = NULL;