Ignore:
Timestamp:
Feb 4, 2011, 1:20:53 AM (10 years ago)
Author:
sam
Message:

Merge the Fusion class back into Board.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/monsterz/interface.cpp

    r350 r352  
    2222#include "title.h"
    2323#include "board.h"
    24 #include "fusion.h"
    2524#include "monsterz.h"
    2625
     
    3635    Title *title;
    3736    Board *board;
    38     Fusion *fusion;
    3937    int screen, tiles;
    4038
     
    5755    data->title = NULL;
    5856    data->board = NULL;
    59     data->fusion = NULL;
    6057    data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
    6158    data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
     
    8380            Ticker::Unref(data->title);
    8481            data->title = NULL;
    85             data->fusion = new Fusion(int2(6, 8), 3, 12);
    86             Ticker::Ref(data->fusion);
    87 #if 0
    88             data->board = new Board(int2(8, 8), 8);
     82            data->board = new Board(Board::GAME_FUSION, int2(6, 8), 3, 12);
     83            //data->board = new Board(Board::GAME_HUNT, int2(8, 8), 8, 8);
    8984            Ticker::Ref(data->board);
    90 #endif
    9185            data->state = InterfaceData::GAME;
    9286        }
     
    118112    if (data->board)
    119113        Ticker::Unref(data->board);
    120     if (data->fusion)
    121         Ticker::Unref(data->fusion);
    122114    Tiler::Deregister(data->tiles);
    123115    Tiler::Deregister(data->screen);
Note: See TracChangeset for help on using the changeset viewer.