From 71045152800ab0cc0dce6ec70dba9d7f9bb9dab5 Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Thu, 18 Jun 2009 17:20:59 -0400
Subject: Started Board class

---
 gamestate.cpp | 92 +++++++++++++++++++++--------------------------------------
 1 file changed, 32 insertions(+), 60 deletions(-)

(limited to 'gamestate.cpp')

diff --git a/gamestate.cpp b/gamestate.cpp
index 0bcf3d7..fd115f8 100644
--- a/gamestate.cpp
+++ b/gamestate.cpp
@@ -2,43 +2,44 @@
 
 GameState::GameState(SDL_PixelFormat* fmt)
 {
-	int x,y;
-	for (y=0;y<HEIGHT;y++)
-	{
-		for (x=0;x<WIDTH;x++)
-		{
-			blocks[x][y] = false;
-		}
-	}
-
-	on = SDL_MapRGB(fmt, 0, 0, 0);
-	off = SDL_MapRGB(fmt, 255, 255, 255);
 	player_color = SDL_MapRGB(fmt, 255, 255, 0);
 
-	playerx = 1;
-	playery = 1;
+	newGame = true;
+	doneMaking = false;
 }
 
 void GameState::input(SDLKey key)
 {
-	switch (key)
+	if (doneMaking)
 	{
-		case SDLK_LEFT:
-			move(playerx-1, playery);
+		switch (key)
+		{
+			case SDLK_LEFT:
+				move(playerx-1, playery);
 
-			break;
-		case SDLK_RIGHT:
-			move(playerx+1, playery);
+				break;
+			case SDLK_RIGHT:
+				move(playerx+1, playery);
 
-			break;
-		case SDLK_UP:
-			move(playerx, playery-1);
+				break;
+			case SDLK_UP:
+				move(playerx, playery-1);
 
-			break;
-		case SDLK_DOWN:
-			move(playerx, playery+1);
+				break;
+			case SDLK_DOWN:
+				move(playerx, playery+1);
+
+				break;
+		}
+	}
 
-			break;
+	if (newGame)
+	{
+		playerx = 1;
+		playery = 1;
+		board = Board();
+		newGame = false;
+		doneMaking = false;
 	}
 }
 
@@ -46,50 +47,21 @@ void GameState::move(int x, int y)
 {
 	wrap(&x, &y);
 
-	if (blocks[x][y]) return;
+	if (board.isObstructed(x,y)) return;
 
 	playerx = x;
 	playery = y;
 }
 
-void GameState::wrap(int* x, int* y)
-{
-	if (*x < 0)
-	{
-		*x = WIDTH-(0-*x);
-	} else if (*y < 0)
-	{
-		*y = HEIGHT-(0-*y);
-	} else if (*x >= WIDTH)
-	{
-		*x = *x-WIDTH;
-	} else if (*y >= HEIGHT)
-	{
-		*y = *y-HEIGHT;
-	}
-}
-
 void GameState::render(SDL_Surface* screen)
 {
-	SDL_Rect block;
-	block.w = 16;
-	block.h = 16;
-
-	int x,y;
-
-	for (y=0;y<HEIGHT;y++)
-	{
-		for (x=0;x<WIDTH;x++)
-		{
-			block.x = x*16;
-			block.y = y*16;
-
-			SDL_FillRect(screen, &block, (blocks[x][y] ? on : off));
-		}
-	}
+	board.render(screen);
 
+	SDL_Rect block;
 	block.x = playerx*16;
 	block.y = playery*16;
+	block.w = 16;
+	block.h = 16;
 
 	SDL_FillRect(screen, &block, player_color);
 }
-- 
cgit 1.4.1