From 7b92903af52dbdf4b0dbfa10dc45345531d88595 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 18 Jun 2009 18:02:54 -0400
Subject: Added Level class

---
 gamestate.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'gamestate.cpp')

diff --git a/gamestate.cpp b/gamestate.cpp
index fd115f8..d1c17b2 100644
--- a/gamestate.cpp
+++ b/gamestate.cpp
@@ -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;
-- 
cgit 1.4.1