From: Côme Chilliet <come@chilliet.eu>
Date: Thu, 1 Dec 2016 04:08:07 +0000 (+0700)
Subject: Merge branch 'master' of gitlab.com:osslugaru/lugaru
X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=2ff8f400c9f3f19e0ac128bb331cf3203c44132e;hp=d9af94bbebdd8ab2b276a0a66492c9d97677d4f4;p=lugaru.git

Merge branch 'master' of gitlab.com:osslugaru/lugaru
---

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index e5c89d9..19d043d 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -5749,18 +5749,7 @@ void Game::Tick()
                     yaw = Dialog::currentScene().camerayaw;
                     pitch = Dialog::currentScene().camerapitch;
                     if (Dialog::dialoguetime > 0.5) {
-                        if (     Input::isKeyPressed(SDL_SCANCODE_1) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_2) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_3) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_4) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_5) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_6) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_7) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_8) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_9) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_0) ||
-                                 Input::isKeyPressed(SDL_SCANCODE_MINUS) ||
-                                 Input::isKeyPressed(attackkey)) {
+                        if (Input::isKeyPressed(attackkey)) {
                             Dialog::indialogue++;
                             if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) {
                                 if (Dialog::currentScene().sound != 0) {