Changeset 339 for trunk/monsterz/interface.cppTweet

Timestamp:

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

Author:

sam

Message:

Start working on a new gameplay, codenamed "Fusion".

File:

• trunk/monsterz/interface.cpp (modified) (5 diffs)

trunk/monsterz/interface.cpp

@@ -22 +22 @@
 #include "title.h"
 #include "board.h"
+#include "fusion.h"
 #include "monsterz.h"
 
@@ -35 +36 @@
     Title *title;
     Board *board;
+    Fusion *fusion;
     int screen, tiles;
 
@@ -55 +57 @@
     data->title = NULL;
     data->board = NULL;
+    data->fusion = NULL;
     data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
@@ -80 +83 @@
             Ticker::Unref(data->title);
             data->title = NULL;
-            data->board = new Board(int2(8, 8), 9);
+            data->fusion = new Fusion(int2(6, 8), 8);
+            Ticker::Ref(data->fusion);
+#if 0
+            data->board = new Board(int2(8, 8), 8);
             Ticker::Ref(data->board);
+#endif
             data->state = InterfaceData::GAME;
         }
@@ -111 +118 @@
     if (data->board)
         Ticker::Unref(data->board);
+    if (data->fusion)
+        Ticker::Unref(data->fusion);
     Tiler::Deregister(data->tiles);
     Tiler::Deregister(data->screen);