riyyi/rpg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add collision layer to MapLoad

Browse Source
This commit is contained in:
Riyyi
2015-03-21 20:43:41 +01:00
parent 129236788f
commit f21211acb3
9 changed files with 153 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/state/maingame.cpp
+2 -4
View File
@@ -17,8 +17,7 @@ void MainGame::Initialize(sf::RenderWindow* window) {
// Load Map
this->map = new Map();
MapLoad mapLoad;
mapLoad.Load(this->map, "data/map/level1.json");
MapLoad(this->map, "data/map/level1.json");
// Load Camera
this->camera = new Camera(window);
@@ -39,8 +38,7 @@ void MainGame::Update(sf::RenderWindow* window) {
if(inputManager.IsPressed(InputManager::LoadMap)) {
std::cout << "Loading Map..." << std::endl;
MapLoad mapLoad;
mapLoad.Load(this->map, "data/map/level1.json");
MapLoad(this->map, "data/map/level1.json", 1);
}
}