[Pingus-CVS] r3232 - in trunk/pingus: . src src/gui src/input

[grumbel at BerliOS]

Author: grumbel
Date: 2007-09-22 17:58:45 +0200 (Sat, 22 Sep 2007)
New Revision: 3232

Modified:
   trunk/pingus/TODO
   trunk/pingus/src/gui/screen_manager.cpp
   trunk/pingus/src/input/manager.cpp
   trunk/pingus/src/input/manager.hpp
   trunk/pingus/src/pingus_main.cpp
Log:
- fixed bug in controller file handling

Modified: trunk/pingus/TODO
===================================================================
--- trunk/pingus/TODO   2007-09-22 15:46:31 UTC (rev 3231)
+++ trunk/pingus/TODO   2007-09-22 15:58:45 UTC (rev 3232)
@@ -91,6 +91,8 @@
 Important:
 ==========
 
+- frameskip seems broken
+
 - remove verbose
 
 - option menu:

Modified: trunk/pingus/src/gui/screen_manager.cpp
===================================================================
--- trunk/pingus/src/gui/screen_manager.cpp     2007-09-22 15:46:31 UTC (rev 
3231)
+++ trunk/pingus/src/gui/screen_manager.cpp     2007-09-22 15:58:45 UTC (rev 
3232)
@@ -21,6 +21,7 @@
 #include <iostream>
 #include "../globals.hpp"
 #include "math/size.hpp"
+#include "pathname.hpp"
 #include "cursor.hpp"
 #include "display.hpp"
 #include "screen_manager.hpp"
@@ -52,9 +53,11 @@
   Input::Controller* input_controller = 0;
 
   if (controller_file.empty())
-    input_controller = 
input_manager.create_controller("data/controller/default.scm");
+    input_controller = 
input_manager.create_controller(Pathname("controller/default.scm", 
+                                                                
Pathname::DATA_PATH));
   else
-    input_controller = input_manager.create_controller(controller_file);
+    input_controller = 
input_manager.create_controller(Pathname(controller_file,
+                                                                
Pathname::SYSTEM_PATH));
 
   Cursor* cursor = 0;
   if (swcursor_enabled)

Modified: trunk/pingus/src/input/manager.cpp
===================================================================
--- trunk/pingus/src/input/manager.cpp  2007-09-22 15:46:31 UTC (rev 3231)
+++ trunk/pingus/src/input/manager.cpp  2007-09-22 15:58:45 UTC (rev 3232)
@@ -21,6 +21,7 @@
 
 #include "string_util.hpp"
 #include "pingus_error.hpp"
+#include "pathname.hpp"
 #include "path_manager.hpp"
 #include "sdl_driver.hpp"
 #include "core_driver.hpp"
@@ -88,7 +89,7 @@
 }
 
 Controller*
-Manager::create_controller(const std::string& filename)
+Manager::create_controller(const Pathname& filename)
 {
   std::auto_ptr<Controller> controller(new Controller(desc));
 
@@ -96,7 +97,7 @@
 
   if (reader.get_name() != "pingus-controller")
     {
-      PingusError::raise("Controller: invalid config file '" + filename + "'");
+      PingusError::raise("Controller: invalid config file '" + filename.str() 
+ "'");
     }
   else
     {

Modified: trunk/pingus/src/input/manager.hpp
===================================================================
--- trunk/pingus/src/input/manager.hpp  2007-09-22 15:46:31 UTC (rev 3231)
+++ trunk/pingus/src/input/manager.hpp  2007-09-22 15:58:45 UTC (rev 3232)
@@ -42,7 +42,7 @@
 
   void update(float delta);
 
-  Controller* create_controller(const std::string& filename);
+  Controller* create_controller(const Pathname& filename);
 
   Button*   create_button  (const FileReader& reader, Control* parent);
   Axis*     create_axis    (const FileReader& reader, Control* parent);

Modified: trunk/pingus/src/pingus_main.cpp
===================================================================
--- trunk/pingus/src/pingus_main.cpp    2007-09-22 15:46:31 UTC (rev 3231)
+++ trunk/pingus/src/pingus_main.cpp    2007-09-22 15:58:45 UTC (rev 3232)
@@ -237,7 +237,7 @@
 PingusMain::parse_args(int argc, char** argv)
 {
   CommandLine argp;
-  argp.add_usage("pingus [OPTIONS]... [FILES]...");
+  argp.add_usage("pingus [OPTIONS]... [FILE]");
   argp.add_doc("Pingus is a puzzle game where you need to guide a bunch of 
little penguins around the world.");
 
   argp.add_option('h', "help", "",