Changeset 312Tweet

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:

• monsterz/board.h (modified) (3 diffs)
• monsterz/game.h (modified) (2 diffs)
• monsterz/mash.h (modified) (3 diffs)
• monsterz/monsterz.h (modified) (2 diffs)
• monsterz/piece.h (modified) (4 diffs)
• src/Makefile.am (modified) (1 diff)
• src/core.h (modified) (1 diff)
• src/worldentity.cpp (added)
• src/worldentity.h (added)
• win32/deushax.vcxproj (modified) (2 diffs)
• win32/deushax.vcxproj.filters (modified) (2 diffs)
• win32/monsterz.vcxproj (modified) (2 diffs)
• win32/monsterz.vcxproj.filters (modified) (2 diffs)

trunk/monsterz/board.h

@@ -1 +1 @@
 //
-// Deus Hax (working title)
-// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Monsterz
+//
+// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the Do What The Fuck You Want To
+//   Public License, Version 2, as published by Sam Hocevar. See
+//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
 //
 
@@ -9 +14 @@
 //
 
-#if !defined __DH_BOARD_H__
-#define __DH_BOARD_H__
+#if !defined __MONSTERZ_BOARD_H__
+#define __MONSTERZ_BOARD_H__
 
-#include "entity.h"
 #include "game.h"
 
 class BoardData;
 
-class Board : public Entity
+class Board : public WorldEntity
 {
 public:
@@ -36 +40 @@
 };
 
-#endif // __DH_BOARD_H__
+#endif // __MONSTERZ_BOARD_H__
 

trunk/monsterz/game.h

@@ -14 +14 @@
 //
 
-#if !defined __DH_GAME_H__
-#define __DH_GAME_H__
+#if !defined __MONSTERZ_GAME_H__
+#define __MONSTERZ_GAME_H__
 
 #include "entity.h"
@@ -42 +42 @@
 };
 
-#endif // __DH_GAME_H__
+#endif // __MONSTERZ_GAME_H__
 

trunk/monsterz/mash.h

@@ -1 +1 @@
 //
-// Deus Hax (working title)
-// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Monsterz
+//
+// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the Do What The Fuck You Want To
+//   Public License, Version 2, as published by Sam Hocevar. See
+//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
 //
 
@@ -9 +14 @@
 //
 
-#if !defined __DH_MASH_H__
-#define __DH_MASH_H__
+#if !defined __MONSTERZ_MASH_H__
+#define __MONSTERZ_MASH_H__
 
 #include "entity.h"
@@ -37 +42 @@
 };
 
-#endif // __DH_MASH_H__
+#endif // __MONSTERZ_MASH_H__
 

trunk/monsterz/monsterz.h

@@ -8 +8 @@
 //   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
 //
+
+#if !defined __MONSTERZ_MONSTERZ_H__
+#define __MONSTERZ_MONSTERZ_H__
 
 static char const * const PNG_BACKGROUND = "monsterz/gfx/background.png";
@@ -28 +31 @@
 /* Duration of the explosion */
 static int const DELAY_POP = 500;
+
+#endif // __MONSTERZ_MONSTERZ_H__
+

trunk/monsterz/piece.h

@@ -1 +1 @@
 //
-// Deus Hax (working title)
-// Copyright (c) 2010-2011 Sam Hocevar <sam@hocevar.net>
+// Monsterz
+//
+// Copyright: (c) 2005-2011 Sam Hocevar <sam@hocevar.net>
+//   This program is free software; you can redistribute it and/or
+//   modify it under the terms of the Do What The Fuck You Want To
+//   Public License, Version 2, as published by Sam Hocevar. See
+//   http://sam.zoy.org/projects/COPYING.WTFPL for more details.
 //
 
@@ -9 +14 @@
 //
 
-#if !defined __DH_PIECE_H__
-#define __DH_PIECE_H__
+#if !defined __MONSTERZ_PIECE_H__
+#define __MONSTERZ_PIECE_H__
 
 #include "core.h"
@@ -16 +21 @@
 class PieceData;
 
-class Piece : public Entity
+class Piece : public WorldEntity
 {
 public:
@@ -48 +53 @@
 };
 
-#endif // __DH_PIECE_H__
+#endif // __MONSTERZ_PIECE_H__
 

trunk/src/Makefile.am

@@ -9 +9 @@
     profiler.cpp profiler.h input.h input.cpp world.cpp world.h \
     sample.cpp sample.h sampler.cpp sampler.h text.cpp text.h \
-    emitter.cpp emitter.h numeric.h \
+    emitter.cpp emitter.h numeric.h worldentity.cpp worldentity.h \
     \
     sdlinput.cpp sdlinput.h \

trunk/src/core.h

@@ -36 +36 @@
 #include "text.h"
 #include "tileset.h"
+#include "worldentity.h"
 #include "world.h"
 

trunk/win32/deushax.vcxproj

@@ -42 +42 @@
     <ClInclude Include="..\src\timer.h" />
     <ClInclude Include="..\src\video.h" />
+    <ClInclude Include="..\src\worldentity.h" />
     <ClInclude Include="..\src\world.h" />
   </ItemGroup>
@@ -73 +74 @@
     <ClCompile Include="..\src\video.cpp" />
     <ClCompile Include="..\src\world.cpp" />
+    <ClCompile Include="..\src\worldentity.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

trunk/win32/deushax.vcxproj.filters

@@ -80 +80 @@
     </ClInclude>
     <ClInclude Include="..\src\video.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\worldentity.h">
       <Filter>lolengine</Filter>
     </ClInclude>
@@ -164 +167 @@
       <Filter>lolengine</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\worldentity.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
     <ClCompile Include="..\deushax\debugsprite.cpp" />
     <ClCompile Include="..\deushax\deushax.cpp" />

trunk/win32/monsterz.vcxproj

@@ -45 +45 @@
     <ClInclude Include="..\src\timer.h" />
     <ClInclude Include="..\src\video.h" />
+    <ClInclude Include="..\src\worldentity.h" />
     <ClInclude Include="..\src\world.h" />
   </ItemGroup>
@@ -78 +79 @@
     <ClCompile Include="..\src\video.cpp" />
     <ClCompile Include="..\src\world.cpp" />
+    <ClCompile Include="..\src\worldentity.cpp" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

trunk/win32/monsterz.vcxproj.filters

@@ -80 +80 @@
     </ClInclude>
     <ClInclude Include="..\src\video.h">
+      <Filter>lolengine</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\worldentity.h">
       <Filter>lolengine</Filter>
     </ClInclude>
@@ -167 +170 @@
       <Filter>lolengine</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\worldentity.cpp">
+      <Filter>lolengine</Filter>
+    </ClCompile>
     <ClCompile Include="..\monsterz\board.cpp" />
     <ClCompile Include="..\monsterz\game.cpp" />