[Pingus-CVS] r4084 - in trunk/pingus/src: engine/input_old pingus pingus/screens pingus/worldmap

[grumbel at BerliOS]

Author: grumbel
Date: 2009-11-08 20:37:19 +0100 (Sun, 08 Nov 2009)
New Revision: 4084

Modified:
   trunk/pingus/src/engine/input_old/axis_factory.cpp
   trunk/pingus/src/engine/input_old/axis_factory.hpp
   trunk/pingus/src/engine/input_old/button_factory.cpp
   trunk/pingus/src/engine/input_old/button_factory.hpp
   trunk/pingus/src/engine/input_old/controller.cpp
   trunk/pingus/src/engine/input_old/controller.hpp
   trunk/pingus/src/engine/input_old/pointer_factory.cpp
   trunk/pingus/src/engine/input_old/pointer_factory.hpp
   trunk/pingus/src/engine/input_old/scroller_factory.cpp
   trunk/pingus/src/engine/input_old/scroller_factory.hpp
   trunk/pingus/src/pingus/savegame.cpp
   trunk/pingus/src/pingus/savegame.hpp
   trunk/pingus/src/pingus/screens/story_screen.cpp
   trunk/pingus/src/pingus/screens/story_screen.hpp
   trunk/pingus/src/pingus/server_event.cpp
   trunk/pingus/src/pingus/server_event.hpp
   trunk/pingus/src/pingus/worldmap/dot.cpp
   trunk/pingus/src/pingus/worldmap/dot.hpp
   trunk/pingus/src/pingus/worldmap/dot_factory.cpp
   trunk/pingus/src/pingus/worldmap/dot_factory.hpp
   trunk/pingus/src/pingus/worldmap/drawable.hpp
   trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
   trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
   trunk/pingus/src/pingus/worldmap/level_dot.cpp
   trunk/pingus/src/pingus/worldmap/level_dot.hpp
   trunk/pingus/src/pingus/worldmap/path_graph.cpp
   trunk/pingus/src/pingus/worldmap/path_graph.hpp
   trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
   trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
   trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
   trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
Log:
Pass FileReader by const reference


Modified: trunk/pingus/src/engine/input_old/axis_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/axis_factory.cpp  2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/engine/input_old/axis_factory.cpp  2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -28,7 +28,7 @@
 
 using namespace Axes;
 
-Axis* AxisFactory::create(FileReader reader)
+Axis* AxisFactory::create(const FileReader& reader)
 {
   if (reader.get_name() == "button-axis")
     return button_axis(reader);
@@ -48,7 +48,7 @@
   return 0; // never reached
 }
 
-Axis* AxisFactory::button_axis(FileReader reader)
+Axis* AxisFactory::button_axis(const FileReader& reader)
 {
   float angle;
   if (!reader.read_float("angle", angle))
@@ -65,12 +65,12 @@
   return new ButtonAxis(angle, button1, button2);
 }
 
-Axis* AxisFactory::inverted_axis (FileReader reader)
+Axis* AxisFactory::inverted_axis (const FileReader& reader)
 {
   return new InvertedAxis(create(reader));
 }
 
-Axis* AxisFactory::joystick_axis(FileReader reader)
+Axis* AxisFactory::joystick_axis(const FileReader& reader)
 {
   float angle;
   if (!reader.read_float("angle", angle))
@@ -87,7 +87,7 @@
   return new JoystickAxis(id, axis, angle);
 }
 
-Axis* AxisFactory::multiple_axis(FileReader reader)
+Axis* AxisFactory::multiple_axis(const FileReader& reader)
 {
   std::vector<Axis*> axes;
 

Modified: trunk/pingus/src/engine/input_old/axis_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/axis_factory.hpp  2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/engine/input_old/axis_factory.hpp  2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -26,13 +26,13 @@
 class AxisFactory
 {
 private:
-  static Axis* button_axis(FileReader reader);
-  static Axis* inverted_axis(FileReader reader);
-  static Axis* joystick_axis(FileReader reader);
-  static Axis* multiple_axis(FileReader reader);
+  static Axis* button_axis(const FileReader& reader);
+  static Axis* inverted_axis(const FileReader& reader);
+  static Axis* joystick_axis(const FileReader& reader);
+  static Axis* multiple_axis(const FileReader& reader);
 
 public:
-  static Axis* create(FileReader reader);
+  static Axis* create(const FileReader& reader);
 
 private:
   AxisFactory();

Modified: trunk/pingus/src/engine/input_old/button_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/button_factory.cpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/button_factory.cpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -30,7 +30,7 @@
 
 using namespace Buttons;
 
-Button* ButtonFactory::create(FileReader reader)
+Button* ButtonFactory::create(const FileReader& reader)
 {
   if (reader.get_name() == "double-button")
     return double_button(reader);
@@ -56,7 +56,7 @@
   return 0; // never reached
 }
 
-Button* ButtonFactory::double_button(FileReader reader)
+Button* ButtonFactory::double_button(const FileReader& reader)
 {
   const std::vector<FileReader>& sections = reader.get_sections();
   
@@ -71,7 +71,7 @@
   return new DoubleButton(button1, button2);
 }
 
-Button* ButtonFactory::joystick_button(FileReader reader)
+Button* ButtonFactory::joystick_button(const FileReader& reader)
 {
   int id;
   if (!reader.read_int("id", id))
@@ -84,7 +84,7 @@
   return new JoystickButton(id, button);
 }
 
-Button* ButtonFactory::key_button(FileReader reader)
+Button* ButtonFactory::key_button(const FileReader& reader)
 {
   std::string key;
   if (!reader.read_string("key", key))
@@ -93,7 +93,7 @@
   return new KeyButton(KeyButton::string_to_keyid(key));
 }
 
-Button* ButtonFactory::mouse_button (FileReader reader)
+Button* ButtonFactory::mouse_button (const FileReader& reader)
 {
   int button;
   if (!reader.read_int("button", button))
@@ -102,7 +102,7 @@
   return new MouseButton(button);
 }
 
-Button* ButtonFactory::multiple_button(FileReader reader)
+Button* ButtonFactory::multiple_button(const FileReader& reader)
 {
   std::vector<Button*> buttons;
 
@@ -115,7 +115,7 @@
   return new MultipleButton(buttons);
 }
 
-Button* ButtonFactory::triple_button(FileReader reader)
+Button* ButtonFactory::triple_button(const FileReader& reader)
 {
   const std::vector<FileReader>& sections = reader.get_sections();
   

Modified: trunk/pingus/src/engine/input_old/button_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/button_factory.hpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/button_factory.hpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -26,15 +26,15 @@
 class ButtonFactory
 {
 private:
-  static Button* double_button   (FileReader reader);
-  static Button* joystick_button (FileReader reader);
-  static Button* key_button      (FileReader reader);
-  static Button* mouse_button    (FileReader reader);
-  static Button* multiple_button (FileReader reader);
-  static Button* triple_button   (FileReader reader);
+  static Button* double_button   (const FileReader& reader);
+  static Button* joystick_button (const FileReader& reader);
+  static Button* key_button      (const FileReader& reader);
+  static Button* mouse_button    (const FileReader& reader);
+  static Button* multiple_button (const FileReader& reader);
+  static Button* triple_button   (const FileReader& reader);
 
 public:
-  static Button* create (FileReader reader);
+  static Button* create (const FileReader& reader);
 
 private:
   ButtonFactory ();

Modified: trunk/pingus/src/engine/input_old/controller.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.cpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/engine/input_old/controller.cpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -201,7 +201,7 @@
 }
 
 void
-Controller::create_action_buttons(FileReader reader)
+Controller::create_action_buttons(const FileReader& reader)
 {
   int count = 0;
   

Modified: trunk/pingus/src/engine/input_old/controller.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/controller.hpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/engine/input_old/controller.hpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -78,7 +78,7 @@
 
   static void on_button_down(void*);
   static void on_button_up(void*);
-  void create_action_buttons(FileReader reader);
+  void create_action_buttons(const FileReader& reader);
 
   struct key_callback_info {
     key_callback_func callback;

Modified: trunk/pingus/src/engine/input_old/pointer_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointer_factory.cpp       2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/pointer_factory.cpp       2009-11-08 
19:37:19 UTC (rev 4084)
@@ -27,7 +27,7 @@
 
 using namespace Pointers;
 
-Pointer* PointerFactory::create (FileReader reader)
+Pointer* PointerFactory::create (const FileReader& reader)
 {
   if (reader.get_name() == "axis-pointer")
     return axis_pointer(reader);
@@ -44,7 +44,7 @@
   return 0; // never reached
 }
 
-Pointer* PointerFactory::axis_pointer (FileReader reader)
+Pointer* PointerFactory::axis_pointer (const FileReader& reader)
 {
   float speed;
   if (!reader.read_float("speed", speed))
@@ -67,7 +67,7 @@
   return new MousePointer;
 }
 
-Pointer* PointerFactory::multiple_pointer (FileReader reader)
+Pointer* PointerFactory::multiple_pointer (const FileReader& reader)
 {
   std::vector<Pointer*> pointers;
 

Modified: trunk/pingus/src/engine/input_old/pointer_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/pointer_factory.hpp       2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/pointer_factory.hpp       2009-11-08 
19:37:19 UTC (rev 4084)
@@ -26,12 +26,12 @@
 class PointerFactory
 {
 private:
-  static Pointer* axis_pointer(FileReader reader);
+  static Pointer* axis_pointer(const FileReader& reader);
   static Pointer* mouse_pointer();
-  static Pointer* multiple_pointer(FileReader reader);
+  static Pointer* multiple_pointer(const FileReader& reader);
 
 public:
-  static Pointer* create(FileReader reader);
+  static Pointer* create(const FileReader& reader);
 
 private:
   PointerFactory();

Modified: trunk/pingus/src/engine/input_old/scroller_factory.cpp
===================================================================
--- trunk/pingus/src/engine/input_old/scroller_factory.cpp      2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/scroller_factory.cpp      2009-11-08 
19:37:19 UTC (rev 4084)
@@ -36,7 +36,7 @@
 using namespace Scrollers;
 
 Scroller*
-ScrollerFactory::create(FileReader reader)
+ScrollerFactory::create(const FileReader& reader)
 {
   if (reader.get_name() == "axis-scroller")
     return axis_scroller(reader);
@@ -63,7 +63,7 @@
 }
 
 Scroller*
-ScrollerFactory::axis_scroller(FileReader reader)
+ScrollerFactory::axis_scroller(const FileReader& reader)
 {
   float speed;
   if (!reader.read_float("speed", speed))
@@ -79,7 +79,7 @@
 }
 
 Scroller*
-ScrollerFactory::inverted_scroller(FileReader reader)
+ScrollerFactory::inverted_scroller(const FileReader& reader)
 {
   bool invert_x;
   if (!reader.read_bool("invert-x", invert_x))
@@ -96,7 +96,7 @@
 }
 
 Scroller*
-ScrollerFactory::joystick_scroller(FileReader reader)
+ScrollerFactory::joystick_scroller(const FileReader& reader)
 {
   int id;
   if (!reader.read_int("id", id))
@@ -110,7 +110,7 @@
 }
 
 Scroller*
-ScrollerFactory::mouse_scroller (FileReader reader)
+ScrollerFactory::mouse_scroller (const FileReader& reader)
 {
   int id = 0;
   reader.read_int("id", id);
@@ -118,7 +118,7 @@
 }
 
 Scroller*
-ScrollerFactory::multiple_scroller(FileReader reader)
+ScrollerFactory::multiple_scroller(const FileReader& reader)
 {
   std::vector<Scroller*> scrollers;
 
@@ -133,7 +133,7 @@
 }
 
 Scroller*
-ScrollerFactory::pointer_scroller(FileReader reader)
+ScrollerFactory::pointer_scroller(const FileReader& reader)
 {
   Pointer* pointer;
   Button*  button;

Modified: trunk/pingus/src/engine/input_old/scroller_factory.hpp
===================================================================
--- trunk/pingus/src/engine/input_old/scroller_factory.hpp      2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/engine/input_old/scroller_factory.hpp      2009-11-08 
19:37:19 UTC (rev 4084)
@@ -26,15 +26,15 @@
 class ScrollerFactory
 {
 private:
-  static Scroller* axis_scroller(FileReader reader);
-  static Scroller* inverted_scroller(FileReader reader);
-  static Scroller* joystick_scroller(FileReader reader);
-  static Scroller* mouse_scroller(FileReader reader);
-  static Scroller* multiple_scroller(FileReader reader);
-  static Scroller* pointer_scroller(FileReader reader);
+  static Scroller* axis_scroller(const FileReader& reader);
+  static Scroller* inverted_scroller(const FileReader& reader);
+  static Scroller* joystick_scroller(const FileReader& reader);
+  static Scroller* mouse_scroller(const FileReader& reader);
+  static Scroller* multiple_scroller(const FileReader& reader);
+  static Scroller* pointer_scroller(const FileReader& reader);
 
 public:
-  static Scroller* create(FileReader reader);
+  static Scroller* create(const FileReader& reader);
 
 private:
   ScrollerFactory();

Modified: trunk/pingus/src/pingus/savegame.cpp
===================================================================
--- trunk/pingus/src/pingus/savegame.cpp        2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/savegame.cpp        2009-11-08 19:37:19 UTC (rev 
4084)
@@ -58,7 +58,7 @@
 {
 }
 
-Savegame::Savegame(FileReader reader) :
+Savegame::Savegame(const FileReader& reader) :
   filename(),
   status(),
   needed_time(),
@@ -90,7 +90,7 @@
 }
 
 void
-Savegame::read_sexpr(FileReader reader)
+Savegame::read_sexpr(const FileReader& reader)
 {
   reader.read_string ("filename", filename);
   reader.read_enum   ("status",   status, string_to_status);

Modified: trunk/pingus/src/pingus/savegame.hpp
===================================================================
--- trunk/pingus/src/pingus/savegame.hpp        2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/savegame.hpp        2009-11-08 19:37:19 UTC (rev 
4084)
@@ -48,11 +48,11 @@
 
   Savegame();
   ~Savegame() { }
-  Savegame(FileReader node);
+  Savegame(const FileReader& node);
   Savegame(const std::string& filename, 
            S_Status arg_status, int arg_time, int arg_saved_pingus);
 
-  void read_sexpr(FileReader node);
+  void read_sexpr(const FileReader& node);
   void write_sexpr(SExprFileWriter& xml);
 
   std::string get_filename() const { return filename; }

Modified: trunk/pingus/src/pingus/screens/story_screen.cpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.cpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/screens/story_screen.cpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -132,7 +132,7 @@
   StoryScreenSkipButton & operator=(const StoryScreenSkipButton&);
 };
 
-StoryScreen::StoryScreen(FileReader reader) :
+StoryScreen::StoryScreen(const FileReader& reader) :
   story(new WorldmapNS::WorldmapStory(reader)),
   story_comp(),
   continue_button(0),

Modified: trunk/pingus/src/pingus/screens/story_screen.hpp
===================================================================
--- trunk/pingus/src/pingus/screens/story_screen.hpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/screens/story_screen.hpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -43,7 +43,7 @@
   GUI::SurfaceButton* skip_button;
 
 public:
-  StoryScreen(FileReader reader);
+  StoryScreen(const FileReader& reader);
   ~StoryScreen();
 
   void on_startup();

Modified: trunk/pingus/src/pingus/server_event.cpp
===================================================================
--- trunk/pingus/src/pingus/server_event.cpp    2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/server_event.cpp    2009-11-08 19:37:19 UTC (rev 
4084)
@@ -31,7 +31,7 @@
 {
 }
 
-ServerEvent::ServerEvent(FileReader reader) :
+ServerEvent::ServerEvent(const FileReader& reader) :
   type(PINGU_ACTION_EVENT),
   time_stamp(0),
   pingu_id(0),

Modified: trunk/pingus/src/pingus/server_event.hpp
===================================================================
--- trunk/pingus/src/pingus/server_event.hpp    2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/server_event.hpp    2009-11-08 19:37:19 UTC (rev 
4084)
@@ -54,7 +54,7 @@
   ServerEvent();
 
   /** Construct an server event from an xml subtree */
-  ServerEvent(FileReader reader);
+  ServerEvent(const FileReader& reader);
 
   void write(std::ostream& out) const;
 

Modified: trunk/pingus/src/pingus/worldmap/dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.cpp    2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/worldmap/dot.cpp    2009-11-08 19:37:19 UTC (rev 
4084)
@@ -19,7 +19,7 @@
 
 namespace WorldmapNS {
 
-Dot::Dot(FileReader reader) :
+Dot::Dot(const FileReader& reader) :
   Drawable(),
   pos()
 {

Modified: trunk/pingus/src/pingus/worldmap/dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot.hpp    2009-11-08 19:30:19 UTC (rev 
4083)
+++ trunk/pingus/src/pingus/worldmap/dot.hpp    2009-11-08 19:37:19 UTC (rev 
4084)
@@ -30,7 +30,7 @@
   Vector3f pos;
 
 public:
-  Dot(FileReader reader);
+  Dot(const FileReader& reader);
 
   /** Draw stuff that should be displayed if the mouse is over the dot */
   virtual void draw_hover(DrawingContext& gc) =0;

Modified: trunk/pingus/src/pingus/worldmap/dot_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot_factory.cpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/dot_factory.cpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -23,7 +23,7 @@
 namespace WorldmapNS {
 
 Dot*
-DotFactory::create(FileReader reader)
+DotFactory::create(const FileReader& reader)
 {
   if (reader.get_name() == "leveldot")
   {

Modified: trunk/pingus/src/pingus/worldmap/dot_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/dot_factory.hpp    2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/dot_factory.hpp    2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -28,7 +28,7 @@
 private:
 public:
   /** Create a Dot from a given piece of XML */
-  static Dot* create(FileReader reader);
+  static Dot* create(const FileReader& reader);
 private:
   DotFactory (const DotFactory&);
   DotFactory& operator= (const DotFactory&);

Modified: trunk/pingus/src/pingus/worldmap/drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable.hpp       2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/drawable.hpp       2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -49,7 +49,7 @@
   {
   }
 
-  Drawable(FileReader reader) :
+  Drawable(const FileReader& reader) :
     name(),
     visible(true)
   {

Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable_factory.cpp       2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.cpp       2009-11-08 
19:37:19 UTC (rev 4084)
@@ -23,7 +23,7 @@
 namespace WorldmapNS {
 
 Drawable*
-DrawableFactory::create(FileReader reader)
+DrawableFactory::create(const FileReader& reader)
 {
   if (reader.get_name() == "surface")
   {

Modified: trunk/pingus/src/pingus/worldmap/drawable_factory.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/drawable_factory.hpp       2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/drawable_factory.hpp       2009-11-08 
19:37:19 UTC (rev 4084)
@@ -26,7 +26,7 @@
 private:
   public:
   /** Create a new drawable */
-  static Drawable* create(FileReader reader);
+  static Drawable* create(const FileReader& reader);
 private:
   DrawableFactory (const DrawableFactory&);
   DrawableFactory& operator= (const DrawableFactory&);

Modified: trunk/pingus/src/pingus/worldmap/level_dot.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.cpp      2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/level_dot.cpp      2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -28,7 +28,7 @@
 
 namespace WorldmapNS {
 
-LevelDot::LevelDot(FileReader reader) :
+LevelDot::LevelDot(const FileReader& reader) :
   Dot(reader.read_section("dot")),
   green_dot_sur("core/worldmap/dot_green"),
   red_dot_sur("core/worldmap/dot_red"),

Modified: trunk/pingus/src/pingus/worldmap/level_dot.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/level_dot.hpp      2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/level_dot.hpp      2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -35,7 +35,7 @@
   PingusLevel plf;
 
 public:
-  LevelDot(FileReader reader);
+  LevelDot(const FileReader& reader);
 
   void draw(DrawingContext& gc);
   void draw_hover(DrawingContext& gc);

Modified: trunk/pingus/src/pingus/worldmap/path_graph.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.cpp     2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/path_graph.cpp     2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -52,7 +52,7 @@
 }
 
 void
-PathGraph::parse_nodes(FileReader reader)
+PathGraph::parse_nodes(const FileReader& reader)
 {
   const std::vector<FileReader>& childs = reader.get_sections();
 
@@ -83,7 +83,7 @@
 }
 
 void
-PathGraph::parse_edges(FileReader reader)
+PathGraph::parse_edges(const FileReader& reader)
 {
   const std::vector<FileReader>& childs = reader.get_sections();
 

Modified: trunk/pingus/src/pingus/worldmap/path_graph.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/path_graph.hpp     2009-11-08 19:30:19 UTC 
(rev 4083)
+++ trunk/pingus/src/pingus/worldmap/path_graph.hpp     2009-11-08 19:37:19 UTC 
(rev 4084)
@@ -81,8 +81,8 @@
   std::string lookup_edge(NodeId id);
 
 private:
-  void parse_nodes(FileReader reader);
-  void parse_edges(FileReader reader);
+  void parse_nodes(const FileReader& reader);
+  void parse_edges(const FileReader& reader);
   void init_cache();
 
   PathGraph (const PathGraph&);

Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.cpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -74,7 +74,7 @@
 }
  
 void
-PingusWorldmap::parse_file(FileReader reader)
+PingusWorldmap::parse_file(const FileReader& reader)
 {
   if (reader.get_name() == "pingus-worldmap")
   {
@@ -97,7 +97,7 @@
 }
 
 void
-PingusWorldmap::parse_properties(FileReader reader)
+PingusWorldmap::parse_properties(const FileReader& reader)
 {
   reader.read_string("music",  impl->music);
   reader.read_string("author", impl->author);

Modified: trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/pingus_worldmap.hpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -28,7 +28,7 @@
 public:
   PingusWorldmap();
   PingusWorldmap(const Pathname& pathname);
-  PingusWorldmap(FileReader reader);
+  PingusWorldmap(const FileReader& reader);
 
   std::string get_name() const;
   std::string get_short_name() const;
@@ -49,8 +49,8 @@
   const std::vector<FileReader>& get_objects() const;
 
 private:
-  void parse_file(FileReader reader);
-  void parse_properties(FileReader reader);
+  void parse_file(const FileReader& reader);
+  void parse_properties(const FileReader& reader);
 
 protected:
   boost::shared_ptr<PingusWorldmapImpl> impl;

Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.cpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -22,7 +22,7 @@
 
 namespace WorldmapNS {
 
-SpriteDrawable::SpriteDrawable(FileReader reader) :
+SpriteDrawable::SpriteDrawable(const FileReader& reader) :
   Drawable(reader),
   surface(),
   pos(),

Modified: trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp
===================================================================
--- trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp        2009-11-08 
19:30:19 UTC (rev 4083)
+++ trunk/pingus/src/pingus/worldmap/sprite_drawable.hpp        2009-11-08 
19:37:19 UTC (rev 4084)
@@ -34,7 +34,7 @@
   bool       auto_uncover;
 
 public:
-  SpriteDrawable(FileReader reader);
+  SpriteDrawable(const FileReader& reader);
 
   void update(float delta);
   void draw(DrawingContext&);