Commit 3e833e99 authored by Jerry's avatar Jerry
Browse files

some small fixes for an release build

parent 50b5a4bb
......@@ -17,6 +17,7 @@ victim_mass : 1
map_load_timer : 0
test_ui : false
mapGenDebug : false
navDebug : false
player_move_left_key : A
player_move_left_key2 : Left
player_move_left_cbutton : LEFT
......
......@@ -10,12 +10,12 @@ namespace gdw {
game_state_machine::game_state_machine(engine& engine):engine_(engine), current_state_(nullptr) {
game_states_[type_id<play_state>()] = make_unique<play_state>(engine);
//game_states_[type_id<menu_state>()] = make_unique<menu_state>(engine);
//game_states_[type_id<credits_state>()] = make_unique<credits_state>(engine);
game_states_[type_id<menu_state>()] = make_unique<menu_state>(engine);
game_states_[type_id<credits_state>()] = make_unique<credits_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();
}
......
......@@ -8,7 +8,9 @@
int main(int argc, char* argv[]) {
try {
#ifdef STACKTRACE
gdw::initStacktrace(argv[0]);
#endif
gdw::engine e;
e.run();
} catch (std::exception& ex) {
......
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