Changeset 312


Ignore:
Timestamp:
Jan 31, 2011, 2:50:48 AM (10 years ago)
Author:
sam
Message:

Create the WorldEntity class, for objects with world coordinates.

Location:
trunk
Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/monsterz/board.h

    r308 r312  
    11//
    2 // Deus Hax (working title)
    3 // Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
     2// Monsterz
     3//
     4// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     5//   This program is free software; you can redistribute it and/or
     6//   modify it under the terms of the Do What The Fuck You Want To
     7//   Public License, Version 2, as published by Sam Hocevar. See
     8//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    49//
    510
     
    914//
    1015
    11 #if !defined __DH_BOARD_H__
    12 #define __DH_BOARD_H__
     16#if !defined __MONSTERZ_BOARD_H__
     17#define __MONSTERZ_BOARD_H__
    1318
    14 #include "entity.h"
    1519#include "game.h"
    1620
    1721class BoardData;
    1822
    19 class Board : public Entity
     23class Board : public WorldEntity
    2024{
    2125public:
     
    3640};
    3741
    38 #endif // __DH_BOARD_H__
     42#endif // __MONSTERZ_BOARD_H__
    3943
  • trunk/monsterz/game.h

    r289 r312  
    1414//
    1515
    16 #if !defined __DH_GAME_H__
    17 #define __DH_GAME_H__
     16#if !defined __MONSTERZ_GAME_H__
     17#define __MONSTERZ_GAME_H__
    1818
    1919#include "entity.h"
     
    4242};
    4343
    44 #endif // __DH_GAME_H__
     44#endif // __MONSTERZ_GAME_H__
    4545
  • trunk/monsterz/mash.h

    r297 r312  
    11//
    2 // Deus Hax (working title)
    3 // Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
     2// Monsterz
     3//
     4// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     5//   This program is free software; you can redistribute it and/or
     6//   modify it under the terms of the Do What The Fuck You Want To
     7//   Public License, Version 2, as published by Sam Hocevar. See
     8//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    49//
    510
     
    914//
    1015
    11 #if !defined __DH_MASH_H__
    12 #define __DH_MASH_H__
     16#if !defined __MONSTERZ_MASH_H__
     17#define __MONSTERZ_MASH_H__
    1318
    1419#include "entity.h"
     
    3742};
    3843
    39 #endif // __DH_MASH_H__
     44#endif // __MONSTERZ_MASH_H__
    4045
  • trunk/monsterz/monsterz.h

    r311 r312  
    88//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    99//
     10
     11#if !defined __MONSTERZ_MONSTERZ_H__
     12#define __MONSTERZ_MONSTERZ_H__
    1013
    1114static char const * const PNG_BACKGROUND = "monsterz/gfx/background.png";
     
    2831/* Duration of the explosion */
    2932static int const DELAY_POP = 500;
     33
     34#endif // __MONSTERZ_MONSTERZ_H__
     35
  • trunk/monsterz/piece.h

    r303 r312  
    11//
    2 // Deus Hax (working title)
    3 // Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
     2// Monsterz
     3//
     4// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
     5//   This program is free software; you can redistribute it and/or
     6//   modify it under the terms of the Do What The Fuck You Want To
     7//   Public License, Version 2, as published by Sam Hocevar. See
     8//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
    49//
    510
     
    914//
    1015
    11 #if !defined __DH_PIECE_H__
    12 #define __DH_PIECE_H__
     16#if !defined __MONSTERZ_PIECE_H__
     17#define __MONSTERZ_PIECE_H__
    1318
    1419#include "core.h"
     
    1621class PieceData;
    1722
    18 class Piece : public Entity
     23class Piece : public WorldEntity
    1924{
    2025public:
     
    4853};
    4954
    50 #endif // __DH_PIECE_H__
     55#endif // __MONSTERZ_PIECE_H__
    5156
  • trunk/src/Makefile.am

    r293 r312  
    99    profiler.cpp profiler.h input.h input.cpp world.cpp world.h \
    1010    sample.cpp sample.h sampler.cpp sampler.h text.cpp text.h \
    11     emitter.cpp emitter.h numeric.h \
     11    emitter.cpp emitter.h numeric.h worldentity.cpp worldentity.h \
    1212    \
    1313    sdlinput.cpp sdlinput.h \
  • trunk/src/core.h

    r293 r312  
    3636#include "text.h"
    3737#include "tileset.h"
     38#include "worldentity.h"
    3839#include "world.h"
    3940
  • trunk/win32/deushax.vcxproj

    r293 r312  
    4242    <ClInclude Include="..\src\timer.h" />
    4343    <ClInclude Include="..\src\video.h" />
     44    <ClInclude Include="..\src\worldentity.h" />
    4445    <ClInclude Include="..\src\world.h" />
    4546  </ItemGroup>
     
    7374    <ClCompile Include="..\src\video.cpp" />
    7475    <ClCompile Include="..\src\world.cpp" />
     76    <ClCompile Include="..\src\worldentity.cpp" />
    7577  </ItemGroup>
    7678  <PropertyGroup Label="Globals">
  • trunk/win32/deushax.vcxproj.filters

    r293 r312  
    8080    </ClInclude>
    8181    <ClInclude Include="..\src\video.h">
     82      <Filter>lolengine</Filter>
     83    </ClInclude>
     84    <ClInclude Include="..\src\worldentity.h">
    8285      <Filter>lolengine</Filter>
    8386    </ClInclude>
     
    164167      <Filter>lolengine</Filter>
    165168    </ClCompile>
     169    <ClCompile Include="..\src\worldentity.cpp">
     170      <Filter>lolengine</Filter>
     171    </ClCompile>
    166172    <ClCompile Include="..\deushax\debugsprite.cpp" />
    167173    <ClCompile Include="..\deushax\deushax.cpp" />
  • trunk/win32/monsterz.vcxproj

    r293 r312  
    4545    <ClInclude Include="..\src\timer.h" />
    4646    <ClInclude Include="..\src\video.h" />
     47    <ClInclude Include="..\src\worldentity.h" />
    4748    <ClInclude Include="..\src\world.h" />
    4849  </ItemGroup>
     
    7879    <ClCompile Include="..\src\video.cpp" />
    7980    <ClCompile Include="..\src\world.cpp" />
     81    <ClCompile Include="..\src\worldentity.cpp" />
    8082  </ItemGroup>
    8183  <PropertyGroup Label="Globals">
  • trunk/win32/monsterz.vcxproj.filters

    r293 r312  
    8080    </ClInclude>
    8181    <ClInclude Include="..\src\video.h">
     82      <Filter>lolengine</Filter>
     83    </ClInclude>
     84    <ClInclude Include="..\src\worldentity.h">
    8285      <Filter>lolengine</Filter>
    8386    </ClInclude>
     
    167170      <Filter>lolengine</Filter>
    168171    </ClCompile>
     172    <ClCompile Include="..\src\worldentity.cpp">
     173      <Filter>lolengine</Filter>
     174    </ClCompile>
    169175    <ClCompile Include="..\monsterz\board.cpp" />
    170176    <ClCompile Include="..\monsterz\game.cpp" />
Note: See TracChangeset for help on using the changeset viewer.