[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/gui screen_manager.cxx,1.6,1.7
From: |
grumbel |
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/gui screen_manager.cxx,1.6,1.7 |
Date: |
15 Apr 2003 10:33:17 -0000 |
Update of /var/lib/cvs/Games/Pingus/src/gui
In directory dark:/tmp/cvs-serv15076/gui
Modified Files:
screen_manager.cxx
Log Message:
- added config flag for the controller
- replaced setlocale (LC_CTYPE, ) by bind_textdomain_codeset(PACKAGE,
ISO-8859-1);
Index: screen_manager.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/gui/screen_manager.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- screen_manager.cxx 6 Apr 2003 12:40:47 -0000 1.6
+++ screen_manager.cxx 15 Apr 2003 10:33:15 -0000 1.7
@@ -42,7 +42,13 @@
void
ScreenManager::display ()
{
- Input::Controller input_controller(path_manager.complete
("controller/default.xml"));
+ Input::Controller* input_controller;
+
+ if (controller_file.empty())
+ input_controller = new
Input::Controller(path_manager.complete("controller/default.xml"));
+ else
+ input_controller = new Input::Controller(controller_file);
+
DeltaManager delta_manager;
// Main loop for the menu
@@ -62,11 +68,11 @@
CL_System::keep_alive ();
// Get new events from ClanLib
- input_controller.update (time_delta);
+ input_controller->update (time_delta);
// Fill the delta with values
GameDelta delta (time_delta, delta_manager.get_absolute(),
- input_controller.get_events ());
+ input_controller->get_events ());
last_screen = get_current_screen();
@@ -115,6 +121,8 @@
// Stupid hack to make this thing take less CPU
CL_System::sleep (0);
}
+
+ delete input_controller;
}
ScreenPtr&
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/gui screen_manager.cxx,1.6,1.7,
grumbel <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/po cs.po,1.7,1.8 de.po,1.41,1.42 sr.po,1.2,1.3 tr.po,1.26,1.27
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx,1.12,1.13 globals.hxx,1.15,1.16 pingus_main.cxx,1.81,1.82
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/po cs.po,1.7,1.8 de.po,1.41,1.42 sr.po,1.2,1.3 tr.po,1.26,1.27
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src globals.cxx,1.12,1.13 globals.hxx,1.15,1.16 pingus_main.cxx,1.81,1.82
- Index(es):