Changeset 341Tweet

Timestamp:

Feb 3, 2011, 2:28:48 AM (10 years ago)

Author:

sam

Message:

Use the Thumbs class in the new Fusion board, too.

File:

• trunk/monsterz/fusion.cpp (modified) (6 diffs)

trunk/monsterz/fusion.cpp

@@ -21 +21 @@
 #include "fusion.h"
 #include "piece.h"
+#include "thumbs.h"
 #include "mash.h"
 #include "monsterz.h"
@@ -35 +36 @@
     int2 dim;
     int npieces;
-    int board, tiles, icons;
+    int board, tiles;
 
     struct Pair
@@ -45 +46 @@
     int next[2], rotation;
 
-    Text *counticons[MAX_PIECES];
-    int counts[MAX_PIECES];
-
     Text *scoretext;
     int score;
 
     Emitter *emitter;
+    Thumbs *thumbs;
 
     enum
@@ -71 +70 @@
     data->board = Tiler::Register(PNG_BOARD, 384, 384, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
-    data->icons = Tiler::Register(PNG_ICONS, 24, 24, 1.0f);
 
     data->emitter = new Emitter(data->tiles, float3(0, -0.0006f, 0));
     Ticker::Ref(data->emitter);
+
+    data->thumbs = new Thumbs(npieces);
+    Ticker::Ref(data->thumbs);
 
     for (int j = 0; j < data->dim.j; j++)
@@ -201 +202 @@
     Input::UntrackMouse(this);
 
+    Ticker::Unref(data->thumbs);
     for (int j = 0; j < data->dim.j; j++)
         for (int i = 0; i < data->dim.i; i++)
@@ -210 +212 @@
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->tiles);
-    Tiler::Deregister(data->icons);
     delete data;
 }