Lots of fixes.

Unarelith · Unarelith · commit 412a844bd5c7 · 2019-04-06T20:47:11.000+02:00
diff --git a/client/source/ClientApplication.cpp b/client/source/ClientApplication.cpp
@@ -27,6 +27,7 @@ void ClientApplication::init() {
 
 	m_window.create(sf::VideoMode(Config::screenWidth, Config::screenHeight), "R-Type", sf::Style::Close);
 
+	m_keyboardHandler.loadKeysFromFile("resources/config/keys.xml");
 	gk::GamePad::init(m_keyboardHandler);
 
 	m_resourceHandler.loadConfigFile<AudioLoader>("resources/config/audio.xml");
diff --git a/client/source/graphics/Button.cpp b/client/source/graphics/Button.cpp
@@ -25,7 +25,7 @@ Button::Button(const std::string &text) {
 	m_text.setCharacterSize(25);
 	m_text.setString(text);
 	m_text.setPosition(m_image.width()  / 2.0f - m_text.getLocalBounds().width  / 2.0f,
-	                   m_image.height() / 2.0f - m_text.getLocalBounds().height / 2.0f);
+	                   m_image.height() / 2.0f - m_text.getLocalBounds().height / 2.0f - 4);
 }
 
 Button::Button(const std::string &text, int posX, int posY) : Button(text) {
@@ -44,12 +44,12 @@ void Button::onEvent(const sf::Event &event) {
 	sf::IntRect rect{{(int)getPosition().x, (int)getPosition().y}, {m_image.width(), m_image.height()}};
 	if (event.type == sf::Event::MouseButtonPressed) {
 		if (event.mouseButton.button == sf::Mouse::Left)
-			m_isPressed = gk::Mouse::isInRect(rect);
+			m_isPressed = rect.contains(event.mouseButton.x, event.mouseButton.y);
 	}
 
 	if (m_isPressed && event.type == sf::Event::MouseButtonReleased) {
 		if (event.mouseButton.button == sf::Mouse::Left) {
-			m_hasReleased = gk::Mouse::isInRect(rect);
+			m_hasReleased = rect.contains(event.mouseButton.x, event.mouseButton.y);
 			m_isPressed = false;
 
 			if (m_hasReleased)
diff --git a/client/source/graphics/TextInput.cpp b/client/source/graphics/TextInput.cpp
@@ -38,12 +38,12 @@ void TextInput::setSize(u16 width, u16 height) {
 }
 
 void TextInput::onEvent(const sf::Event &event) {
-	if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Backspace && !m_content.empty()) {
-		m_content.erase(m_content.begin() + m_content.length() - 1);
-		gk::AudioPlayer::playSound("sound-keyboard");
-
-		m_text.setString(m_content + "|");
-	}
+	// if (event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Backspace && !m_content.empty()) {
+	// 	m_content.erase(m_content.begin() + m_content.length() - 1);
+	// 	gk::AudioPlayer::playSound("sound-keyboard");
+    //
+	// 	m_text.setString(m_content + "|");
+	// }
 
   	// if (event.type == SDL_TEXTINPUT) {
 	// 	std::string text = event.text.text;
diff --git a/client/source/states/GameEndState.cpp b/client/source/states/GameEndState.cpp
@@ -32,6 +32,7 @@ GameEndState::GameEndState(bool isWinner) {
 	m_leave.setPosition(Config::screenWidth / 2.0f - m_leave.width() / 2.0, 240);
 	m_exit.setPosition(Config::screenWidth / 2.0f - m_exit.width() / 2.0, 240 + m_exit.height() + 20);
 
+	gk::AudioPlayer::pauseMusic();
 	gk::AudioPlayer::playMusic(isWinner ? "music-victory" : "music-gameover");
 }
 
diff --git a/client/source/states/GameState.cpp b/client/source/states/GameState.cpp
@@ -27,6 +27,7 @@
 GameState::GameState(const sf::IpAddress &serverAddress, u16 serverPort) {
 	m_client.connect(serverAddress, serverPort);
 
+	gk::AudioPlayer::pauseMusic();
 	gk::AudioPlayer::playMusic("music-game");
 
 	m_background2.setPosition(m_background.width() - 2.0f, 0);
diff --git a/client/source/states/TitleScreenState.cpp b/client/source/states/TitleScreenState.cpp
@@ -32,6 +32,7 @@ TitleScreenState::TitleScreenState() {
 	m_play.setPosition(Config::screenWidth / 2.0f - m_play.width() / 2.0, 240);
 	m_exit.setPosition(Config::screenWidth / 2.0f - m_exit.width() / 2.0, 240 + m_exit.height() + 20);
 
+	gk::AudioPlayer::pauseMusic();
 	gk::AudioPlayer::playMusic("music-theme");
 }
 
diff --git a/resources/config/keys.xml b/resources/config/keys.xml
@@ -1,4 +1,4 @@
-<!-- Key names are defined here: https://wiki.libsdl.org/SDL_Keycode -->
+<!-- Key names are defined here: https://www.sfml-dev.org/documentation/2.5.1-fr/classsf_1_1Keyboard.php#acb4cacd7cc5802dec45724cf3314a142 -->
 <keys>
 	<Left  key="Left"/>
 	<Right key="Right"/>
@@ -9,5 +9,5 @@
 	<B key="W"/>
 
 	<Start  key="Return"/>
-	<Select key="Backspace"/>
+	<Select key="BackSpace"/>
 </keys>

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ GameEndState::GameEndState(bool isWinner) {`
`32`	`32`	`m_leave.setPosition(Config::screenWidth / 2.0f - m_leave.width() / 2.0, 240);`
`33`	`33`	`m_exit.setPosition(Config::screenWidth / 2.0f - m_exit.width() / 2.0, 240 + m_exit.height() + 20);`
`34`	`34`
	`35`	`+ gk::AudioPlayer::pauseMusic();`
`35`	`36`	`gk::AudioPlayer::playMusic(isWinner ? "music-victory" : "music-gameover");`
`36`	`37`	`}`
`37`	`38`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ TitleScreenState::TitleScreenState() {`
`32`	`32`	`m_play.setPosition(Config::screenWidth / 2.0f - m_play.width() / 2.0, 240);`
`33`	`33`	`m_exit.setPosition(Config::screenWidth / 2.0f - m_exit.width() / 2.0, 240 + m_exit.height() + 20);`
`34`	`34`
	`35`	`+ gk::AudioPlayer::pauseMusic();`
`35`	`36`	`gk::AudioPlayer::playMusic("music-theme");`
`36`	`37`	`}`
`37`	`38`