Changeset 339 for trunk


Ignore:
Timestamp:
Feb 3, 2011, 2:28:45 AM (10 years ago)
Author:
sam
Message:

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

Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/monsterz/Makefile.am

    r331 r339  
    44monsterz_SOURCES = \
    55    monsterz.cpp monsterz.h title.cpp title.h interface.cpp interface.h \
    6     board.cpp board.h piece.cpp piece.h mash.cpp mash.h
     6    fusion.cpp fusion.h board.cpp board.h piece.cpp piece.h mash.cpp mash.h
    77monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
    88monsterz_LDADD = $(top_builddir)/src/liblol.a
  • trunk/monsterz/interface.cpp

    r332 r339  
    2222#include "title.h"
    2323#include "board.h"
     24#include "fusion.h"
    2425#include "monsterz.h"
    2526
     
    3536    Title *title;
    3637    Board *board;
     38    Fusion *fusion;
    3739    int screen, tiles;
    3840
     
    5557    data->title = NULL;
    5658    data->board = NULL;
     59    data->fusion = NULL;
    5760    data->screen = Tiler::Register(PNG_BACKGROUND, 640, 480, 1.0f);
    5861    data->tiles = Tiler::Register(PNG_TILES, 48, 48, 1.0f);
     
    8083            Ticker::Unref(data->title);
    8184            data->title = NULL;
    82             data->board = new Board(int2(8, 8), 9);
     85            data->fusion = new Fusion(int2(6, 8), 8);
     86            Ticker::Ref(data->fusion);
     87#if 0
     88            data->board = new Board(int2(8, 8), 8);
    8389            Ticker::Ref(data->board);
     90#endif
    8491            data->state = InterfaceData::GAME;
    8592        }
     
    111118    if (data->board)
    112119        Ticker::Unref(data->board);
     120    if (data->fusion)
     121        Ticker::Unref(data->fusion);
    113122    Tiler::Deregister(data->tiles);
    114123    Tiler::Deregister(data->screen);
  • trunk/src/input.cpp

    r332 r339  
    127127            if (best != data->lastfocus)
    128128                data->entities[n]->pressed = data->buttons;
     129            else
     130                data->entities[n]->clicked = 0;
    129131        }
    130132        else
  • trunk/win32/monsterz.vcxproj

    r331 r339  
    1313  <ItemGroup>
    1414    <ClInclude Include="..\monsterz\board.h" />
     15    <ClInclude Include="..\monsterz\fusion.h" />
    1516    <ClInclude Include="..\monsterz\interface.h" />
    1617    <ClInclude Include="..\monsterz\mash.h" />
     
    5152  <ItemGroup>
    5253    <ClCompile Include="..\monsterz\board.cpp" />
     54    <ClCompile Include="..\monsterz\fusion.cpp" />
    5355    <ClCompile Include="..\monsterz\interface.cpp" />
    5456    <ClCompile Include="..\monsterz\mash.cpp" />
  • trunk/win32/monsterz.vcxproj.filters

    r331 r339  
    8989    </ClInclude>
    9090    <ClInclude Include="..\monsterz\board.h" />
     91    <ClInclude Include="..\monsterz\fusion.h" />
    9192    <ClInclude Include="..\monsterz\interface.h" />
    9293    <ClInclude Include="..\monsterz\piece.h" />
     
    175176    </ClCompile>
    176177    <ClCompile Include="..\monsterz\board.cpp" />
     178    <ClCompile Include="..\monsterz\fusion.cpp" />
    177179    <ClCompile Include="..\monsterz\interface.cpp" />
    178180    <ClCompile Include="..\monsterz\monsterz.cpp" />
Note: See TracChangeset for help on using the changeset viewer.