Changeset 350 for trunkTweet

Timestamp:

Feb 4, 2011, 12:42:20 AM (12 years ago)

Author:

sam

Message:

Display next piece as a thumbnail.

Location:

trunk/monsterz

Files:

• fusion.cpp (modified) (5 diffs)
• interface.cpp (modified) (1 diff)

trunk/monsterz/fusion.cpp

@@ -37 +37 @@
     int2 dim;
     int minnpieces, npieces, maxnpieces;
-    int board, tiles;
+    int board, tiles, icons;
 
     struct Pair
@@ -74 +74 @@
     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));
@@ -217 +218 @@
     Scene::GetDefault()->AddTile((data->board << 16) | 0,
                                  position.x, position.y, 1, 0);
+
+    Scene::GetDefault()->AddTile((data->icons << 16) | (data->next[0] - 1),
+                                 350, 400, 11, 0);
+    Scene::GetDefault()->AddTile((data->icons << 16) | (data->next[1] - 1),
+                                 380, 400, 11, 0);
 }
 
@@ -346 +352 @@
 
         if (i2 >= 0 && i2 < data->dim.i && j2 >= 0 && j2 < data->dim.j
-             && data->pairs[i2][j2].id == data->pairs[i][j].id 
+             && data->pairs[i2][j2].id == data->pairs[i][j].id
              && list[i2][j2] == -1)
         {
@@ -375 +381 @@
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->tiles);
+    Tiler::Deregister(data->icons);
     delete data;
 }

trunk/monsterz/interface.cpp

@@ -83 +83 @@
             Ticker::Unref(data->title);
             data->title = NULL;
-            data->fusion = new Fusion(int2(8, 7), 3, 12);
+            data->fusion = new Fusion(int2(6, 8), 3, 12);
             Ticker::Ref(data->fusion);
 #if 0