fixed floors bug
This commit is contained in:
@@ -38,16 +38,16 @@ Floors::~Floors()
|
|||||||
void Floors::onInit()
|
void Floors::onInit()
|
||||||
{
|
{
|
||||||
texRepo = engine->renderer->getTextureRepository();
|
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();
|
setBgColorAndAmbientColor();
|
||||||
engine->renderer->setCameraDefinitions(&camera.view, &camera.unitCirclePosition, camera.planes);
|
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.addSongListener(this);
|
||||||
engine->audio.loadSong("sounds/mafikizolo-loot.wav");
|
engine->audio.loadSong("sounds/mafikizolo-loot.wav");
|
||||||
engine->audio.playSong();
|
engine->audio.playSong();
|
||||||
engine->audio.setSongVolume(80);
|
engine->audio.setSongVolume(1);
|
||||||
floorManager = new FloorManager(FLOORS_COUNT, texRepo);
|
|
||||||
player = new Player(&engine->audio, texRepo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Floors::onUpdate()
|
void Floors::onUpdate()
|
||||||
|
|||||||
@@ -30,10 +30,9 @@ FloorManager::FloorManager(int t_floorAmount, TextureRepository *t_texRepo)
|
|||||||
calcSpiral(floorSpiralMaxOffset, floorSpiralMaxOffset);
|
calcSpiral(floorSpiralMaxOffset, floorSpiralMaxOffset);
|
||||||
initFloors();
|
initFloors();
|
||||||
trick = 0.0F;
|
trick = 0.0F;
|
||||||
trickMode = 0;
|
|
||||||
isTimeForChangeTriggerColor = true;
|
isTimeForChangeTriggerColor = true;
|
||||||
isTimeForChangeDefaultColor = true;
|
isTimeForChangeDefaultColor = true;
|
||||||
audioOffset = audioMode = audioTick = 0;
|
audioOffset = audioMode = audioTick = trickMode = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
FloorManager::~FloorManager()
|
FloorManager::~FloorManager()
|
||||||
|
|||||||
Reference in New Issue
Block a user