Fix events

johnBuffer · Jan 1, 2021 · e1ead5e · e1ead5e
1 parent 4879b2c
commit e1ead5e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/display_manager.cpp b/src/display_manager.cpp
@@ -84,8 +84,10 @@ void DisplayManager::processEvents()
 	{
 		switch (event.type)
 		{
+		case sf::Event::Closed:
+			m_window.close();
+			break;
 		case sf::Event::KeyPressed:
-			if (event.type == sf::Event::Closed) m_window.close();
 			if (event.key.code == sf::Keyboard::Escape) m_window.close();
 			else if ((event.key.code == sf::Keyboard::Subtract)) zoom(0.8f);
 			else if ((event.key.code == sf::Keyboard::Add)) zoom(1.2f);

diff --git a/src/main.cpp b/src/main.cpp
@@ -16,7 +16,7 @@ int main()
 	Conf<>::loadTextures();
 
 	World world(Conf<>::WIN_WIDTH, Conf<>::WIN_HEIGHT);
-	Colony colony(800, 450, 512);
+	Colony colony(Conf<>::WIN_WIDTH/2, Conf<>::WIN_HEIGHT/2, 512);
 	world.addMarker(Marker(colony.position, Marker::ToHome, 10.0f, true));
 
 	DisplayManager display_manager(window, window, world, colony);