Changeset 752Tweet

Timestamp:

Apr 4, 2011, 2:05:49 AM (10 years ago)

Author:

sam

Message:

monsterz: do not display the interface in the title screen.

Location:

trunk/monsterz

Files:

• board.cpp (modified) (4 diffs)
• interface.cpp (modified) (4 diffs)

trunk/monsterz/board.cpp

@@ -43 +43 @@
     int minnpieces, npieces, maxnpieces;
 
-    int board, tiles, icons;
+    int screen, board, tiles, icons;
     int click, whip;
 
@@ -105 +105 @@
     data->npieces = minnpieces;
     data->maxnpieces = maxnpieces;
+    data->screen = Tiler::Register(PNG_BACKGROUND, vec2i(640, 480), 0, 1.0f);
     data->board = Tiler::Register(PNG_BOARD, 384, 0, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, data->size, 0, 1.0f);
@@ -367 +368 @@
     Scene::GetDefault()->AddTile((data->board << 16) | 0,
                                  position.x, position.y, 1, 0);
+    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0);
 
     switch (data->game)
@@ -847 +849 @@
      * scheduled its sprites! */
     Ticker::Unref(data->emitter);
+    Tiler::Deregister(data->screen);
     Tiler::Deregister(data->board);
     Tiler::Deregister(data->tiles);

trunk/monsterz/interface.cpp

@@ -37 +37 @@
     Title *title;
     Board *board;
-    int screen, tiles;
+    int tiles;
 
     enum
@@ -57 +57 @@
     data->title = NULL;
     data->board = NULL;
-    data->screen = Tiler::Register(PNG_BACKGROUND, vec2i(640, 480), 0, 1.0f);
     data->tiles = Tiler::Register(PNG_TILES, 48, 0, 1.0f);
     data->state = InterfaceData::INIT;
@@ -101 +100 @@
     vec2i mouse = Input::GetMousePos();
 
-    Scene::GetDefault()->AddTile((data->screen << 16) | 0, 0, 0, 10, 0);
-
     if (Platform::GetMouseCount() && mouse.x >= 0 && mouse.y >= 0)
     {
@@ -117 +114 @@
         Ticker::Unref(data->board);
     Tiler::Deregister(data->tiles);
-    Tiler::Deregister(data->screen);
     delete data;
 }