make joystick_options_menu and key_options_menu part of joystickkeyboardcontroller...
authormathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Sun, 7 Mar 2010 23:47:14 +0000 (23:47 +0000)
committermathnerd314 <mathnerd314@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Sun, 7 Mar 2010 23:47:14 +0000 (23:47 +0000)
commit76da82da4d62cc1573acab18182d61c2537def8b
tree45bef37fd8f3d9275ce171e9724063e89bafe172
parent12eb9d91e87f199df1e151e5e077b53c33b9d422
make joystick_options_menu and key_options_menu part of joystickkeyboardcontroller, so they can be freed properly.

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6576 837edb03-e0f3-0310-88ca-d4d4e8b29345
src/control/joystickkeyboardcontroller.cpp
src/control/joystickkeyboardcontroller.hpp
src/supertux/menu/menu_storage.cpp
src/supertux/menu/menu_storage.hpp
src/supertux/menu/options_menu.cpp