@@ -30,13 +30,9 @@ class FlourishState end def button_down(id) - if id == Gosu::Button::KbEscape - Game.window.close - end end def button_up(id) - end end \ No newline at end of file lib/flourish_state.rb @@ -87,9 +87,7 @@ class GameState < FlourishState end def button_down(id) - if id == Gosu::Button::KbEscape - Game.window.close - elsif id == Gosu::Button::MsLeft && ! @selection.visible? + if id == Gosu::Button::MsLeft && ! @selection.visible? @selection.start = @cursor.clone elsif id == Gosu::Button::KbTab || id == Gosu::Button::MsWheelDown @tree.select_next(+1) lib/game_state.rb @@ -15,6 +15,9 @@ class GameWindow < Gosu::Window end def button_down(id) + if id == Gosu::Button::KbEscape + Game.window.close + end Game.state.button_down id end lib/game_window.rb fc4c9130037c67b9c716cf90ba3846af09fb61fb Adam Sanderson netghost@gmail.com http://github.com/adamsanderson/flourish/commit/cf0f523c988b4e787af5d9ce93592e3b966dbf28 cf0f523c988b4e787af5d9ce93592e3b966dbf28 2008-05-12T19:55:01-07:00 2008-05-12T19:55:01-07:00 Make escape always quit. The game should never be complicated enough that you have nested menus. c80eaab2e836e4473fc4503ed8dcd9ce988e2c4c Adam Sanderson netghost@gmail.com