10 files changed, 107 insertions, 18 deletions

@@ -1,4 +1,4 @@
-OBJS = mazeoflife.o gamestate.o board.o
+OBJS = mazeoflife.o gamestate.o board.o level.o
 CC = g++
 CFLAGS = `pkg-config sdl --cflags`
 LIBS = `pkg-config sdl --libs`
@@ -2,12 +2,17 @@
 
 Board::Board()
 {
+        Board(Level());
+}
+
+Board::Board(Level level)
+{
         int x,y;
         for (y=0;y<HEIGHT;y++)
         {
                 for (x=0;x<WIDTH;x++)
                 {
-                        if (x > 10 && x < 20 && y > 10 && y < 20)
+                        if (level.checkSquare(x, y))
                         {
                                 blocks[x][y] = rand() % 2;
                         } else {
@@ -15,9 +20,6 @@ Board::Board()
                         }
                 }
         }
-
-        on = getColor(0, 0, 0);
-        off = getColor(255, 255, 255);
 }
 
 bool Board::isObstructed(int x, int y)
@@ -25,7 +27,7 @@ bool Board::isObstructed(int x, int y)
         return blocks[x][y];
 }
 
-void Board::render(SDL_Surface* screen)
+void Board::render(SDL_Surface* screen, Level level)
 {
         SDL_Rect block;
         block.w = 16;
@@ -40,7 +42,7 @@ void Board::render(SDL_Surface* screen)
                         block.x = x*16;
                         block.y = y*16;
 
-                        SDL_FillRect(screen, &block, (blocks[x][y] ? on : off));
+                        SDL_FillRect(screen, &block, (blocks[x][y] ? level.getAliveColor() : level.getDeadColor()));
                 }
         }
 }
@@ -4,14 +4,13 @@
 class Board
 {
         private:
-                Uint32 on;
-                Uint32 off;
                 bool blocks[WIDTH][HEIGHT];
 
         public:
                 Board();
+                Board(Level level);
                 bool isObstructed(int x, int y);
-                void render(SDL_Surface* screen);
+                void render(SDL_Surface* screen, Level level);
 };
 
 #endif
@@ -1,11 +1,13 @@
 #include "includes.h"
 
-GameState::GameState(SDL_PixelFormat* fmt)
+GameState::GameState()
 {
-        player_color = SDL_MapRGB(fmt, 255, 255, 0);
+        player_color = getColor(255, 255, 0);
 
         newGame = true;
         doneMaking = false;
+
+        level = Level();
 }
 
 void GameState::input(SDLKey key)
@@ -32,14 +34,17 @@ void GameState::input(SDLKey key)
                                 break;
                 }
         }
+}
 
+void GameState::tick()
+{
         if (newGame)
         {
                 playerx = 1;
                 playery = 1;
-                board = Board();
+                board = Board(level);
                 newGame = false;
-                doneMaking = false;
+                doneMaking = true;
         }
 }
 
@@ -55,7 +60,7 @@ void GameState::move(int x, int y)
 
 void GameState::render(SDL_Surface* screen)
 {
-        board.render(screen);
+        board.render(screen, level);
 
         SDL_Rect block;
         block.x = playerx*16;
@@ -7,12 +7,14 @@ class GameState : public State {
                 int playerx, playery;
                 bool newGame;
                 bool doneMaking;
+                Level level;
                 Board board;
                 void move(int x, int y);
 
         public:
-                GameState(SDL_PixelFormat* fmt);
+                GameState();
                 void input(SDLKey key);
+                void tick();
                 void render(SDL_Surface* screen);
 };
 
@@ -2,6 +2,7 @@
 #include <stdio.h>
 #include <time.h>
 #include "mazeoflife.h"
+#include "level.h"
 #include "board.h"
 #include "state.h"
 #include "gamestate.h"
@@ -0,0 +1,57 @@
+#include "includes.h"
+
+Level::Level()
+{
+        level = 1;
+
+        alive[0] = getColor(0, 0, 0); // Black
+        alive[1] = getColor(255, 0, 0); // Red
+        alive[2] = getColor(0, 255, 0); // Green
+        alive[3] = getColor(85, 85, 85); // Dark Gray
+        alive[4] = getColor(255, 0, 255); // Magenta
+
+        dead[0] = getColor(255, 255, 255); // White
+        dead[1] = getColor(255, 192, 203); // Pink
+        dead[2] = getColor(0, 255, 255); // Cyan
+        dead[3] = getColor(170, 170, 170); // Light Gray
+        dead[4] = getColor(255, 128, 0); // Orange
+}
+
+int Level::getLevel()
+{
+        return level;
+}
+
+int Level::getLevelGroup()
+{
+        return (level/10)+1;
+}
+
+bool Level::checkSquare(int x, int y)
+{
+        switch (getLevelGroup())
+        {
+                case 1:
+                        return ((x>13)&&(x<16)&&(y>13)&&(y<16));
+                case 2:
+                        return ((x>13)&&(x<17)&&(y>13)&&(y<17));
+                case 3:
+                case 4:
+                        return ((x>12)&&(x<18)&&(y>12)&&(y<18));
+                case 5:
+                case 6:
+                        return ((x>11)&&(x<19)&&(y>11)&&(y<19));
+                default:
+                        return true;
+        }
+}
+
+Uint32 Level::getAliveColor()
+{
+        return alive[(getLevelGroup()-1)%5];
+}
+
+Uint32 Level::getDeadColor()
+{
+        return dead[(getLevelGroup()-1)%5];
+}
@@ -0,0 +1,20 @@
+#ifndef LEVEL_H
+#define LEVEL_H
+
+class Level
+{
+        private:
+                int level;
+                Uint32 alive[5];
+                Uint32 dead[5];
+
+        public:
+                Level();
+                int getLevel();
+                int getLevelGroup();
+                bool checkSquare(int x, int y);
+                Uint32 getAliveColor();
+                Uint32 getDeadColor();
+};
+
+#endif
@@ -27,13 +27,15 @@ int main(int argc, char *argv[])
         }
 
         SDL_WM_SetCaption("Maze Of Life", NULL);
-        SDL_EnableKeyRepeat(100, 50);
+        SDL_EnableKeyRepeat(150, 75);
 
-        State* state = new GameState(screen->format);
+        State* state = new GameState();
 
         SDL_Event anEvent;
         for (;;)
         {
+                state->tick();
+
                 while (SDL_PollEvent(&anEvent))
                 {
                         switch (anEvent.type)
@@ -5,6 +5,7 @@ class State
 {
         public:
                 virtual void input(SDLKey key) = 0;
+                virtual void tick() = 0;
                 virtual void render(SDL_Surface* screen) = 0;
 };