Changeset 221 for trunk/monsterzTweet

Timestamp:

Jan 18, 2011, 12:05:18 AM (12 years ago)

Author:

sam

Message:

Complete Lol Engine / Deus Hax / Monsterz split.

Location:

trunk/monsterz

Files:

• Makefile.am (modified) (1 diff)
• debugboard.cpp (moved) (moved from trunk/src/debugboard.cpp) (6 diffs, 1 prop)
• debugboard.h (moved) (moved from trunk/src/debugboard.h) (1 prop)
• game.cpp (copied) (copied from trunk/src/game.cpp) (6 diffs)
• game.h (copied) (copied from trunk/src/game.h) (1 diff)
• monsterz.cpp (modified) (4 diffs)

trunk/monsterz/Makefile.am

@@ -2 +2 @@
 noinst_PROGRAMS = monsterz
 
-monsterz_SOURCES = monsterz.cpp
+monsterz_SOURCES = monsterz.cpp game.cpp game.h debugboard.cpp debugboard.h
 monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
 monsterz_LDADD = $(top_builddir)/src/liblol.a

trunk/monsterz/debugboard.cpp

@@ -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.
 //
 
@@ -24 +29 @@
 private:
     Game *game;
-    int tiler;
-    float x, y, z;
+    int background, board, tiler;
 };
 
@@ -37 +41 @@
     data->game = game;
     Ticker::Ref(game);
-    data->tiler = Tiler::Register("monsterz/tiles.png", 48);
-    data->x = 32;
-    data->y = 0;
-    data->z = 112;
+    data->background = Tiler::Register("monsterz/background.png", 640, 480);
+    data->board = Tiler::Register("monsterz/board.png", 384, 384);
+    data->tiler = Tiler::Register("monsterz/tiles.png", 48, 48);
 }
 
@@ -52 +55 @@
     Entity::TickDraw(deltams);
 
-    int x = data->x;
-    int y = data->y;
-    int z = data->z;
+    data->game->GetScene()->AddTile((data->background << 16) | 0, 0, 980, 0, 0);
+    data->game->GetScene()->AddTile((data->board << 16) | 0, 24, 841, 1, 0);
 
     for (int j = 0; j < 8; j++)
@@ -62 +64 @@
         id += (id % 5) / 4;
         data->game->GetScene()->AddTile((data->tiler << 16) | id,
-                                        x + i * 48 - 16, y + j * 48, z, 1);
+                                        i * 48 + 24, j * 48 + 107, 0, 1);
     }
 }
@@ -70 +72 @@
     Ticker::Unref(data->game);
     Tiler::Deregister(data->tiler);
+    Tiler::Deregister(data->board);
+    Tiler::Deregister(data->background);
     delete data;
 }

trunk/monsterz/game.cpp

@@ -1 +1 @@
 //
-// Deus Hax (working title)
-// Copyright (c) 2010 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.
 //
 
@@ -11 +16 @@
 
 #include "core.h"
+#include "game.h"
 
 /*
@@ -21 +27 @@
 
 private:
-    Map *map;
     int x, y;
     int mousex, mousey;
@@ -33 +38 @@
  */
 
-Game::Game(char const *mapname)
+Game::Game()
 {
     data = new GameData();
-    data->map = new Map(mapname);
     data->x = data->y = 0;
     data->done = 0;
@@ -44 +48 @@
 Game::~Game()
 {
-    delete data->map;
     delete data;
 }
@@ -59 +62 @@
     GetScene();
 
-    data->map->Render(data->scene, -data->mousex, -data->mousey, 0);
     data->scene->Render();
 

trunk/monsterz/game.h

@@ -20 +20 @@
 {
 public:
-    Game(char const *mapname);
+    Game();
     ~Game();
 

trunk/monsterz/monsterz.cpp

@@ -1 +1 @@
 //
-// Deus Hax (working title)
-// Copyright (c) 2010 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.
 //
 
@@ -17 +22 @@
 
 #include "core.h"
+#include "game.h"
 #include "sdlinput.h"
 #include "debugfps.h"
 #include "debugboard.h"
-#include "debugsprite.h"
-#include "debugsphere.h"
-#include "debugrecord.h"
-#include "debugstats.h"
 
 static float const FPS = 30.0f;
@@ -46 +48 @@
     }
 
-    SDL_WM_SetCaption("Map Test (SDL)", NULL);
-    SDL_ShowCursor(0);
-    //SDL_WM_GrabInput(SDL_GRAB_ON);
+    SDL_WM_SetCaption("Monsterz", NULL);
 
     /* Initialise OpenGL */
@@ -57 +57 @@
     _chdir(".."); /* Temporary Win32 hack */
 #endif
-    Game *game = new Game("maps/testmap.tmx");
-    game->SetMouse(160, 96);
+    Game *game = new Game();
 
     /* Register an input driver and some debug stuff */
     new SdlInput();
     new DebugFps();
-    new DebugSprite(game);
     new DebugBoard(game);
-    new DebugSphere();
-    //new DebugRecord("lolengine.ogg");
-    new DebugStats("stats.txt");
 
     while (!Ticker::Finished())