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;p=lugaru.git

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

2ff8f400c9f3f19e0ac128bb331cf3203c44132e
diff --cc Source/GameTick.cpp
index 4f238e2,e5c89d9..19d043d
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@@ -5744,17 -5744,28 +5744,17 @@@ void Game::Tick(
                  }
                  if (!Dialog::directing) {
                      pause_sound(whooshsound);
-                     viewer = Dialog::currentBox().camera;
+                     viewer = Dialog::currentScene().camera;
                      viewer.y = max((double)viewer.y, terrain.getHeight(viewer.x, viewer.z) + .1);
-                     yaw = Dialog::currentBox().camerayaw;
-                     pitch = Dialog::currentBox().camerapitch;
+                     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().boxes.size()) {
-                                 if (Dialog::currentBox().sound != 0) {
-                                     playdialogueboxsound();
-                                     if (Dialog::currentBox().sound == -5) {
+                             if (Dialog::indialogue < Dialog::currentDialog().scenes.size()) {
+                                 if (Dialog::currentScene().sound != 0) {
+                                     playdialoguescenesound();
+                                     if (Dialog::currentScene().sound == -5) {
                                          hotspot[numhotspots] = Person::players[0]->coords;
                                          hotspotsize[numhotspots] = 10;
                                          hotspottype[numhotspots] = -1;