[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] r3264 - in trunk/pingus/src: . gui
From: |
grumbel at BerliOS |
Subject: |
[Pingus-CVS] r3264 - in trunk/pingus/src: . gui |
Date: |
Sun, 30 Sep 2007 17:43:10 +0200 |
Author: grumbel
Date: 2007-09-30 17:43:10 +0200 (Sun, 30 Sep 2007)
New Revision: 3264
Modified:
trunk/pingus/src/global_event.cpp
trunk/pingus/src/gui/screen_manager.hpp
Log:
- option menu stuff
Modified: trunk/pingus/src/global_event.cpp
===================================================================
--- trunk/pingus/src/global_event.cpp 2007-09-29 18:59:29 UTC (rev 3263)
+++ trunk/pingus/src/global_event.cpp 2007-09-30 15:43:10 UTC (rev 3264)
@@ -23,6 +23,8 @@
#include "screenshot.hpp"
#include "console.hpp"
#include "fps_counter.hpp"
+#include "gui/screen_manager.hpp"
+#include "option_menu.hpp"
#include "global_event.hpp"
#include "globals.hpp"
@@ -39,69 +41,74 @@
switch (event.keysym.sym)
{
- case SDLK_F1:
- console.toggle_display();
- break;
+ case SDLK_F1:
+ console.toggle_display();
+ break;
- case SDLK_F10:
- fps_counter.toggle_display();
- console << "Toggling fps counter display" << std::endl;
- break;
+ case SDLK_F10:
+ fps_counter.toggle_display();
+ console << "Toggling fps counter display" << std::endl;
+ break;
- case SDLK_RETURN:
- if (!keystate[SDLK_LALT] && !keystate[SDLK_RALT])
+ case SDLK_RETURN:
+ if (!keystate[SDLK_LALT] && !keystate[SDLK_RALT])
+ break;
+ // FALL THROUGH
+ case SDLK_F11:
+ fullscreen_enabled = !fullscreen_enabled;
+ // re-initialize the screen
+ Display::set_video_mode(screen_width, screen_height);
break;
- // FALL THROUGH
- case SDLK_F11:
- fullscreen_enabled = !fullscreen_enabled;
- // re-initialize the screen
- Display::set_video_mode(screen_width, screen_height);
- break;
- case SDLK_F12:
- {
- std::string filename;
- std::cout << "GlobalEvent::Making screenshot..." << std::endl;
- filename = Screenshot::make_screenshot();
- console << "GlobalEvent: Saved screenshot to \"" << filename << "\""
<< std::endl;
- //console << "!\"#$%&'()*+,-./0123456789:;<=>?@";
- console.newline();
- }
- break;
+ case SDLK_F5:
+ //if
(!dynamic_cast<OptionMenu*>(&(ScreenManager::instance()->get_current_screen())))
+ // ScreenManager::instance()->push_screen(new OptionMenu(), true);
+ break;
- case SDLK_c:
- if (maintainer_mode)
- draw_collision_map = !draw_collision_map;
- break;
-
- case SDLK_m:
- if (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL])
+ case SDLK_F12:
{
- std::cout << "Maintainer Mode: " << maintainer_mode << std::endl;
- maintainer_mode = !maintainer_mode;
+ std::string filename;
+ std::cout << "GlobalEvent::Making screenshot..." << std::endl;
+ filename = Screenshot::make_screenshot();
+ console << "GlobalEvent: Saved screenshot to \"" << filename << "\""
<< std::endl;
+ //console << "!\"#$%&'()*+,-./0123456789:;<=>?@";
+ console.newline();
}
- break;
+ break;
- case SDLK_g:
- if (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL])
- {
- if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
- {
- SDL_WM_GrabInput(SDL_GRAB_OFF);
- console << "Grab input off" << std::endl;
- }
- else
- {
- SDL_WM_GrabInput(SDL_GRAB_ON);
- console << "Grab input on" << std::endl;
- }
- }
- break;
+ case SDLK_c:
+ if (maintainer_mode)
+ draw_collision_map = !draw_collision_map;
+ break;
- default:
- // console << "GlobalEvent: Unknown key pressed: " << key.id;
- break;
+ case SDLK_m:
+ if (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL])
+ {
+ std::cout << "Maintainer Mode: " << maintainer_mode << std::endl;
+ maintainer_mode = !maintainer_mode;
+ }
+ break;
+
+ case SDLK_g:
+ if (keystate[SDLK_LCTRL] || keystate[SDLK_RCTRL])
+ {
+ if (SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
+ {
+ SDL_WM_GrabInput(SDL_GRAB_OFF);
+ console << "Grab input off" << std::endl;
+ }
+ else
+ {
+ SDL_WM_GrabInput(SDL_GRAB_ON);
+ console << "Grab input on" << std::endl;
+ }
+ }
+ break;
+
+ default:
+ // console << "GlobalEvent: Unknown key pressed: " << key.id;
+ break;
}
}
Modified: trunk/pingus/src/gui/screen_manager.hpp
===================================================================
--- trunk/pingus/src/gui/screen_manager.hpp 2007-09-29 18:59:29 UTC (rev
3263)
+++ trunk/pingus/src/gui/screen_manager.hpp 2007-09-30 15:43:10 UTC (rev
3264)
@@ -73,6 +73,10 @@
/** Remove all screens from the stack */
void clear();
+
+ /** @return a pointer to the current Screen */
+ ScreenPtr& get_current_screen();
+
private:
void real_clear();
@@ -88,9 +92,6 @@
/** FadeOver test*/
void fade_over (ScreenPtr& old_screen, ScreenPtr& new_screen);
- /** @return a pointer to the current Screen */
- ScreenPtr& get_current_screen();
-
public:
static ScreenManager* instance ();
static void init();
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] r3264 - in trunk/pingus/src: . gui,
grumbel at BerliOS <=