From e987089df0ed074e7a2e3a7a0a188c9c1b1d66ad Mon Sep 17 00:00:00 2001
From: h4570 <hastoklai@gmail.com>
Date: Sun, 27 Dec 2020 13:39:44 +0100
Subject: [PATCH] fixed floors bug

---
 src/samples/floors/floors.cpp                 | 10 +++++-----
 src/samples/floors/managers/floor_manager.cpp |  3 +--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/samples/floors/floors.cpp b/src/samples/floors/floors.cpp
index d83aaee..15e8346 100644
--- a/src/samples/floors/floors.cpp
+++ b/src/samples/floors/floors.cpp
@@ -38,16 +38,16 @@ Floors::~Floors()
 void Floors::onInit()
 {
     texRepo = engine->renderer->getTextureRepository();
+    enemy = new Enemy(texRepo);
+    ui = new Ui(texRepo);
+    floorManager = new FloorManager(FLOORS_COUNT, texRepo); // we must init FloorManager before starting audio!
+    player = new Player(&engine->audio, texRepo);
     setBgColorAndAmbientColor();
     engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes);
-    enemy = new Enemy(texRepo); // I know that here is bug with PNG loading
-    ui = new Ui(texRepo);       // Will be resolved in December version
     engine->audio.addSongListener(this);
     engine->audio.loadSong("sounds/mafikizolo-loot.wav");
     engine->audio.playSong();
-    engine->audio.setSongVolume(80);
-    floorManager = new FloorManager(FLOORS_COUNT, texRepo);
-    player = new Player(&engine->audio, texRepo);
+    engine->audio.setSongVolume(1);
 }
 
 void Floors::onUpdate()
diff --git a/src/samples/floors/managers/floor_manager.cpp b/src/samples/floors/managers/floor_manager.cpp
index 24a6b40..2662527 100644
--- a/src/samples/floors/managers/floor_manager.cpp
+++ b/src/samples/floors/managers/floor_manager.cpp
@@ -30,10 +30,9 @@ FloorManager::FloorManager(int t_floorAmount, TextureRepository *t_texRepo)
     calcSpiral(floorSpiralMaxOffset, floorSpiralMaxOffset);
     initFloors();
     trick = 0.0F;
-    trickMode = 0;
     isTimeForChangeTriggerColor = true;
     isTimeForChangeDefaultColor = true;
-    audioOffset = audioMode = audioTick = 0;
+    audioOffset = audioMode = audioTick = trickMode = 0;
 }
 
 FloorManager::~FloorManager()