Commit dad36b33 authored by Michael Ochmann's avatar Michael Ochmann
Browse files

animated menu; switched entry game state to menu_state

parent 8df9a4f6
......@@ -9,9 +9,41 @@
"width" : 100,
"childs" : [
{
"type" : "textured",
"id" : "menuBackground",
"background" : "ui_texture/Screen.png",
"type" : "animation",
"id" : "menBackdrop",
"frames" : [
"ui/backdrop/Komp 1_00000.png",
"ui/backdrop/Komp 1_00001.png",
"ui/backdrop/Komp 1_00002.png",
"ui/backdrop/Komp 1_00003.png",
"ui/backdrop/Komp 1_00004.png",
"ui/backdrop/Komp 1_00005.png",
"ui/backdrop/Komp 1_00006.png",
"ui/backdrop/Komp 1_00007.png",
"ui/backdrop/Komp 1_00008.png",
"ui/backdrop/Komp 1_00009.png",
"ui/backdrop/Komp 1_00010.png",
"ui/backdrop/Komp 1_00011.png",
"ui/backdrop/Komp 1_00012.png",
"ui/backdrop/Komp 1_00013.png",
"ui/backdrop/Komp 1_00014.png",
"ui/backdrop/Komp 1_00015.png",
"ui/backdrop/Komp 1_00016.png",
"ui/backdrop/Komp 1_00017.png",
"ui/backdrop/Komp 1_00018.png",
"ui/backdrop/Komp 1_00019.png",
"ui/backdrop/Komp 1_00020.png",
"ui/backdrop/Komp 1_00021.png",
"ui/backdrop/Komp 1_00022.png",
"ui/backdrop/Komp 1_00023.png",
"ui/backdrop/Komp 1_00024.png",
"ui/backdrop/Komp 1_00025.png",
"ui/backdrop/Komp 1_00026.png",
"ui/backdrop/Komp 1_00027.png",
"ui/backdrop/Komp 1_00028.png",
"ui/backdrop/Komp 1_00029.png"
],
"frametime" : 0.07,
"x" : 0,
"y" : 0,
"height" : 100,
......@@ -25,7 +57,7 @@
"text" : "DETH BUFF ARR",
"color" : "000000FF",
"x" : 1,
"y" : 3,
"y" : 6,
"height" : 100,
"width" : 100,
"childs" : []
......
......@@ -12,7 +12,8 @@ game_state_machine::game_state_machine(engine& engine):engine_(engine), current_
game_states_[type_id<menu_state>()] = make_unique<menu_state>(engine);
//default state
current_state_ = game_states_[type_id<play_state>()].get();
//current_state_ = game_states_[type_id<play_state>()].get();
current_state_ = game_states_[type_id<menu_state>()].get();
current_state_->on_enter();
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment