From b563953a4846bab720cae17ef4ab5a8296730c7c Mon Sep 17 00:00:00 2001
From: Kelly Rauchenberger <fefferburbia@gmail.com>
Date: Sat, 14 Mar 2015 21:02:01 -0400
Subject: Started writing map editor

---
 src/components/map_collision.cpp | 2 +-
 src/components/map_render.cpp    | 2 +-
 src/game.h                       | 2 +-
 src/map.cpp                      | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/components/map_collision.cpp b/src/components/map_collision.cpp
index f385320..9afa6f8 100644
--- a/src/components/map_collision.cpp
+++ b/src/components/map_collision.cpp
@@ -7,7 +7,7 @@ MapCollisionComponent::MapCollisionComponent(const Map& map) : map(map)
   addCollision(-6, 0, GAME_WIDTH, Direction::left, (map.getLeftMap() == nullptr) ? Collision::Type::wrap : Collision::Type::teleport);
   addCollision(GAME_WIDTH+6, 0, GAME_WIDTH, Direction::right, (map.getRightMap() == nullptr) ? Collision::Type::reverse : Collision::Type::teleport);
   
-  for (int i=0; i<MAP_WIDTH*(MAP_HEIGHT-1); i++)
+  for (int i=0; i<MAP_WIDTH*MAP_HEIGHT; i++)
   {
     int x = i % MAP_WIDTH;
     int y = i / MAP_WIDTH;
diff --git a/src/components/map_render.cpp b/src/components/map_render.cpp
index d93afe6..6fdfcc3 100644
--- a/src/components/map_render.cpp
+++ b/src/components/map_render.cpp
@@ -8,7 +8,7 @@ MapRenderComponent::MapRenderComponent(const Map& map) : screen(GAME_WIDTH, GAME
   
   Texture tiles("../res/tiles.png");
   
-  for (int i=0; i<MAP_WIDTH*(MAP_HEIGHT-1); i++)
+  for (int i=0; i<MAP_WIDTH*MAP_HEIGHT; i++)
   {
     int tile = map.getMapdata()[i];
     int x = i % MAP_WIDTH;
diff --git a/src/game.h b/src/game.h
index a4620d4..1818cec 100644
--- a/src/game.h
+++ b/src/game.h
@@ -14,7 +14,7 @@ const int TILE_HEIGHT = 8;
 const int GAME_WIDTH = 320;
 const int GAME_HEIGHT = 200;
 const int MAP_WIDTH = GAME_WIDTH/TILE_WIDTH;
-const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT;
+const int MAP_HEIGHT = GAME_HEIGHT/TILE_HEIGHT - 1;
 
 const int FRAMES_PER_SECOND = 60;
 const double SECONDS_PER_FRAME = 1.0 / FRAMES_PER_SECOND;
diff --git a/src/map.cpp b/src/map.cpp
index 73eb2b4..6b83442 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -50,9 +50,9 @@ Map::Map(const std::string name)
     } else if (!xmlStrcmp(node->name, (const xmlChar*) "environment"))
     {
       xmlChar* key = xmlNodeListGetString(doc, node->xmlChildrenNode, 1);
-      mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
+      mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
       mapdata[0] = atoi(strtok((char*) key, ",\n"));
-      for (int i=1; i<(MAP_WIDTH*(MAP_HEIGHT-1)); i++)
+      for (int i=1; i<(MAP_WIDTH*MAP_HEIGHT); i++)
       {
         mapdata[i] = atoi(strtok(NULL, ",\n"));
       }
@@ -100,8 +100,8 @@ Map::Map(const std::string name)
 
 Map::Map(const Map& map)
 {
-  mapdata = (int*) malloc(MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
-  memcpy(mapdata, map.mapdata, MAP_WIDTH*(MAP_HEIGHT-1)*sizeof(int));
+  mapdata = (int*) malloc(MAP_WIDTH*MAP_HEIGHT*sizeof(int));
+  memcpy(mapdata, map.mapdata, MAP_WIDTH*MAP_HEIGHT*sizeof(int));
   
   title = (char*) malloc((MAP_WIDTH+1)*sizeof(char));
   strncpy(title, map.title, MAP_WIDTH+1);
-- 
cgit 1.4.1