From c6ce9f7c7e2dc346573b63775f7237cad219c32d Mon Sep 17 00:00:00 2001
From: grumbel <grumbel@837edb03-e0f3-0310-88ca-d4d4e8b29345>
Date: Tue, 17 Nov 2009 16:16:30 +0000
Subject: [PATCH] More -Weffc++ cleanup

git-svn-id: http://supertux.lethargik.org/svn/supertux/trunk/supertux@6011 837edb03-e0f3-0310-88ca-d4d4e8b29345
---
 src/badguy/badguy.cpp                      |  3 ++
 src/badguy/badguy.hpp                      | 43 ++++++++++---------
 src/control/joystickkeyboardcontroller.cpp | 10 +++--
 src/gui/button_group.cpp                   |  8 +++-
 src/gui/button_group.hpp                   | 11 +++--
 src/gui/menu.cpp                           | 33 +++++++++++++--
 src/gui/menu.hpp                           | 67 +++++++++++++++++-------------
 src/gui/mousecursor.cpp                    |  7 +++-
 src/gui/mousecursor.hpp                    |  7 +++-
 src/lisp/lexer.cpp                         | 10 ++++-
 src/lisp/lexer.hpp                         |  1 +
 src/lisp/lisp.cpp                          |  5 ++-
 src/lisp/list_iterator.cpp                 |  6 ++-
 src/lisp/parser.cpp                        |  9 +++-
 src/lisp/parser.hpp                        |  2 +
 src/lisp/writer.cpp                        | 12 +++++-
 src/lisp/writer.hpp                        |  1 +
 src/object/ambient_sound.cpp               | 36 ++++++++++++++--
 src/object/ambient_sound.hpp               |  1 +
 src/object/background.cpp                  | 26 ++++++++++--
 src/object/electrifier.cpp                 |  5 ++-
 src/object/electrifier.hpp                 |  2 +
 src/object/rock.cpp                        |  1 +
 src/object/skull_tile.cpp                  |  8 +++-
 src/object/smoke_cloud.cpp                 |  2 +
 src/physfs/physfs_stream.hpp               |  8 ++++
 src/scripting/wind.hpp                     |  6 ++-
 src/sprite/sprite.hpp                      | 10 ++---
 src/supertux/collision.hpp                 | 20 +++++++--
 src/supertux/levelintro.hpp                |  4 ++
 src/supertux/shrinkfade.cpp                | 10 ++++-
 src/supertux/shrinkfade.hpp                |  5 ++-
 src/supertux/spawn_point.cpp               |  9 ++--
 src/supertux/textscroller.hpp              |  8 ++++
 src/video/color.hpp                        | 10 ++---
 src/video/font.cpp                         | 11 +++--
 src/video/font.hpp                         | 37 ++++++++++-------
 src/video/gl/gl_texture.cpp                | 18 ++++++--
 src/video/sdl/sdl_lightmap.cpp             | 11 ++++-
 src/video/sdl/sdl_lightmap.hpp             | 10 ++++-
 src/video/sdl/sdl_texture.hpp              |  4 ++
 src/worldmap/level.cpp                     |  5 +++
 src/worldmap/level.hpp                     |  7 ++--
 src/worldmap/special_tile.cpp              | 15 +++++--
 src/worldmap/special_tile.hpp              |  3 +-
 src/worldmap/sprite_change.cpp             |  9 +++-
 src/worldmap/sprite_change.hpp             | 48 ++++++++++-----------
 src/worldmap/teleporter.cpp                | 11 +++--
 src/worldmap/teleporter.hpp                |  4 +-
 49 files changed, 426 insertions(+), 173 deletions(-)

diff --git a/src/badguy/badguy.cpp b/src/badguy/badguy.cpp
index 83ff6f8bc..acdde41fe 100644
--- a/src/badguy/badguy.cpp
+++ b/src/badguy/badguy.cpp
@@ -32,6 +32,7 @@ static const float Y_OFFSCREEN_DISTANCE = 1200;
 
 BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer) :
   MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), 
+  physic(),
   countMe(true), 
   is_initialized(false),
   start_position(),
@@ -57,6 +58,7 @@ BadGuy::BadGuy(const Vector& pos, const std::string& sprite_name, int layer) :
 
 BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite_name, int layer) :
   MovingSprite(pos, sprite_name, layer, COLGROUP_DISABLED), 
+  physic(),
   countMe(true), 
   is_initialized(false), 
   start_position(),
@@ -82,6 +84,7 @@ BadGuy::BadGuy(const Vector& pos, Direction direction, const std::string& sprite
 
 BadGuy::BadGuy(const Reader& reader, const std::string& sprite_name, int layer) :
   MovingSprite(reader, sprite_name, layer, COLGROUP_DISABLED), 
+  physic(),
   countMe(true), 
   is_initialized(false), 
   start_position(),
diff --git a/src/badguy/badguy.hpp b/src/badguy/badguy.hpp
index 7555d837d..b6aa07516 100644
--- a/src/badguy/badguy.hpp
+++ b/src/badguy/badguy.hpp
@@ -68,15 +68,12 @@ public:
   {
     return start_position;
   }
+
   void set_start_position(const Vector& vec)
   {
     start_position = vec;
   }
 
-  /** Count this badguy to the statistics? This value should not be
-      changed during runtime. */
-  bool countMe;
-
   /** Called when hit by a fire bullet, and is_flammable() returns true */
   virtual void ignite();
 
@@ -132,9 +129,6 @@ protected:
   /** called each frame when the badguy is not activated. */
   virtual void inactive_update(float elapsed_time);
 
-  /** true if initialize() has already been called */
-  bool is_initialized; 
-
   /** called immediately before the first call to initialize */
   virtual void initialize();
   
@@ -163,14 +157,6 @@ protected:
       pixels. Minimum value for height is 1 pixel */
   bool might_fall(int height = 1);
 
-  Vector start_position;
-
-  /** The direction we currently face in */
-  Direction dir;
-
-  /** The direction we initially faced in */
-  Direction start_dir;
-
   /** Get Direction from String. */
   Direction str2dir( std::string dir_str );
 
@@ -190,11 +176,6 @@ protected:
       from above. */
   Vector get_floor_normal();
 
-  bool frozen;
-  bool ignited; /**< true if this badguy is currently on fire */
-
-  std::string dead_script; /**< script to execute when badguy is killed */
-
   /** Returns true if we were in STATE_ACTIVE at the beginning of the
       last call to update() */
   bool is_active();
@@ -208,6 +189,28 @@ private:
 protected:
   Physic physic;
 
+public:  
+  /** Count this badguy to the statistics? This value should not be
+      changed during runtime. */
+  bool countMe;
+
+protected:
+  /** true if initialize() has already been called */
+  bool is_initialized; 
+
+  Vector start_position;
+
+  /** The direction we currently face in */
+  Direction dir;
+
+  /** The direction we initially faced in */
+  Direction start_dir;
+
+  bool frozen;
+  bool ignited; /**< true if this badguy is currently on fire */
+
+  std::string dead_script; /**< script to execute when badguy is killed */
+
 private:
   State state;
 
diff --git a/src/control/joystickkeyboardcontroller.cpp b/src/control/joystickkeyboardcontroller.cpp
index a8b995029..4e14336c5 100644
--- a/src/control/joystickkeyboardcontroller.cpp
+++ b/src/control/joystickkeyboardcontroller.cpp
@@ -57,10 +57,12 @@ public:
   JoystickKeyboardController* controller;
 };
 
-JoystickKeyboardController::JoystickKeyboardController()
-  : hat_state(0),
-    wait_for_key(-1), wait_for_joystick(-1),
-    key_options_menu(0), joystick_options_menu(0)
+JoystickKeyboardController::JoystickKeyboardController() :
+  hat_state(0),
+  wait_for_key(-1), 
+  wait_for_joystick(-1),
+  key_options_menu(0), 
+  joystick_options_menu(0)
 {
   // initialize default keyboard map
   keymap[SDLK_LEFT]     = LEFT;
diff --git a/src/gui/button_group.cpp b/src/gui/button_group.cpp
index 8d38c99e7..0e910e98d 100644
--- a/src/gui/button_group.cpp
+++ b/src/gui/button_group.cpp
@@ -24,7 +24,13 @@ extern SDL_Surface* g_screen;
 ButtonGroup::ButtonGroup(Vector pos_, Vector buttons_size_, Vector buttons_box_) :
   pos(pos_), 
   buttons_size(buttons_size_), 
-  buttons_box(buttons_box_)
+  buttons_box(buttons_box_),
+  buttons(),
+  button_selected(),
+  row(),
+  mouse_hover(),
+  mouse_left_button(),
+  buttons_pair_nb()
 {
   buttons.clear();
   row = 0;
diff --git a/src/gui/button_group.hpp b/src/gui/button_group.hpp
index a9fe1141a..5c52fb517 100644
--- a/src/gui/button_group.hpp
+++ b/src/gui/button_group.hpp
@@ -43,12 +43,17 @@ public:
   bool is_hover();
 
 private:
-  Vector pos, buttons_size, buttons_box;
   typedef std::vector <Button> Buttons;
+
+  Vector pos;
+  Vector buttons_size;
+  Vector buttons_box;
   Buttons buttons;
 
-  int button_selected, row;
-  bool mouse_hover, mouse_left_button;
+  int button_selected;
+  int row;
+  bool mouse_hover;
+  bool mouse_left_button;
 
   int buttons_pair_nb;
 
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index 6c2970a1e..dfafa44b5 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -162,8 +162,16 @@ Menu::recalc_pos()
   }
 }
 
-MenuItem::MenuItem(MenuItemKind _kind, int _id)
-  : kind(_kind) , id(_id)
+MenuItem::MenuItem(MenuItemKind _kind, int _id) :
+  kind(_kind),
+  id(_id),
+  toggled(),
+  text(),
+  input(),
+  help(),
+  list(),
+  selected(),
+  target_menu()
 {
   toggled = false;
   selected = false;
@@ -228,8 +236,25 @@ Menu::~Menu()
     previous = NULL;
 }
 
-Menu::Menu()
-  : close(false)
+Menu::Menu() :
+  hit_item(),
+  pos_x(),
+  pos_y(),
+  menuaction(),
+  delete_character(),
+  mn_input_char(),
+  menu_repeat_time(),
+  close(false),
+  items(),
+  effect_progress(),
+  effect_start_time(),
+  arrange_left(),
+  active_item(),
+  checkbox(),
+  checkbox_checked(),
+  back(),
+  arrow_left(),
+  arrow_right()
 {
   all_menus.push_back(this);
 
diff --git a/src/gui/menu.hpp b/src/gui/menu.hpp
index 66e5f774c..428244d17 100644
--- a/src/gui/menu.hpp
+++ b/src/gui/menu.hpp
@@ -47,6 +47,18 @@ class MenuItem
 {
 public:
   MenuItem(MenuItemKind kind, int id = -1);
+
+  void set_help(const std::string& help_text);
+
+  void change_text (const std::string& text);
+  void change_input(const std::string& text);
+
+  static MenuItem* create(MenuItemKind kind, const std::string& text,
+                          int init_toggle, Menu* target_menu, int id, int key);
+
+  std::string get_input_with_symbol(bool active_item);   // returns the text with an input symbol
+
+public:
   MenuItemKind kind;
   int id;   // item id
   bool toggled;
@@ -59,16 +71,6 @@ public:
 
   Menu* target_menu;
 
-  void set_help(const std::string& help_text);
-
-  void change_text (const std::string& text);
-  void change_input(const std::string& text);
-
-  static MenuItem* create(MenuItemKind kind, const std::string& text,
-                          int init_toggle, Menu* target_menu, int id, int key);
-
-  std::string get_input_with_symbol(bool active_item);   // returns the text with an input symbol
-
 private:
   /// keyboard key or joystick button
   bool input_flickering;
@@ -123,27 +125,7 @@ private:
     MENU_ACTION_BACK
   };
 
-  /** Number of the item that got 'hit' (ie. pressed) in the last
-      event()/update() call, -1 if none */
-  int hit_item;
-
-  // position of the menu (ie. center of the menu, not top/left)
-  float pos_x;
-  float pos_y;
-
-  /** input event for the menu (up, down, left, right, etc.) */
-  MenuAction menuaction;
-
-  /* input implementation variables */
-  int   delete_character;
-  char  mn_input_char;
-  float menu_repeat_time;
-
-  bool close;
-
 public:
-  std::vector<MenuItem*> items;
-
   Menu();
   virtual ~Menu();
 
@@ -173,6 +155,7 @@ public:
   {
     return *(items[index]);
   }
+
   MenuItem& get_item_by_id(int id);
   const MenuItem& get_item_by_id(int id) const;
 
@@ -197,6 +180,30 @@ protected:
 private:
   void check_controlfield_change_event(const SDL_Event& event);
   void draw_item(DrawingContext& context, int index);
+
+private:
+  /** Number of the item that got 'hit' (ie. pressed) in the last
+      event()/update() call, -1 if none */
+  int hit_item;
+
+  // position of the menu (ie. center of the menu, not top/left)
+  float pos_x;
+  float pos_y;
+
+  /** input event for the menu (up, down, left, right, etc.) */
+  MenuAction menuaction;
+
+  /* input implementation variables */
+  int   delete_character;
+  char  mn_input_char;
+  float menu_repeat_time;
+
+  bool close;
+
+public:
+  std::vector<MenuItem*> items;
+
+private:
   float effect_progress;
   float effect_start_time;
   int arrange_left;
diff --git a/src/gui/mousecursor.cpp b/src/gui/mousecursor.cpp
index f9a000d3c..7723b3698 100644
--- a/src/gui/mousecursor.cpp
+++ b/src/gui/mousecursor.cpp
@@ -24,7 +24,12 @@
 MouseCursor* MouseCursor::current_ = 0;
 extern SDL_Surface* g_screen;
 
-MouseCursor::MouseCursor(std::string cursor_file) : mid_x(0), mid_y(0)
+MouseCursor::MouseCursor(std::string cursor_file) : 
+  mid_x(0), 
+  mid_y(0),
+  state_before_click(),
+  cur_state(),
+  cursor()
 {
   cursor = new Surface(cursor_file);
 
diff --git a/src/gui/mousecursor.hpp b/src/gui/mousecursor.hpp
index d924fc34d..897a7eeaa 100644
--- a/src/gui/mousecursor.hpp
+++ b/src/gui/mousecursor.hpp
@@ -65,13 +65,16 @@ public:
   {        current_ = pcursor;      };
 
 private:
-  int mid_x, mid_y;
-  static MouseCursor* current_;
+  int mid_x;
+  int mid_y;
   int state_before_click;
   int cur_state;
   Surface* cursor;
 
 private:
+  static MouseCursor* current_;
+
+private:
   MouseCursor(const MouseCursor&);
   MouseCursor& operator=(const MouseCursor&);
 };
diff --git a/src/lisp/lexer.cpp b/src/lisp/lexer.cpp
index 239e30ace..690d571ed 100644
--- a/src/lisp/lexer.cpp
+++ b/src/lisp/lexer.cpp
@@ -23,8 +23,14 @@
 
 namespace lisp {
 
-Lexer::Lexer(std::istream& newstream)
-  : stream(newstream), eof(false), linenumber(0)
+Lexer::Lexer(std::istream& newstream) :
+  stream(newstream), 
+  eof(false), 
+  linenumber(0),
+  bufend(),
+  bufpos(),
+  c(),
+  token_length()
 {
   // trigger a refill of the buffer
   bufpos = NULL;
diff --git a/src/lisp/lexer.hpp b/src/lisp/lexer.hpp
index 7a79e799b..e51f53614 100644
--- a/src/lisp/lexer.hpp
+++ b/src/lisp/lexer.hpp
@@ -54,6 +54,7 @@ private:
   inline void nextChar();
   inline void addChar();
 
+private:
   std::istream& stream;
   bool eof;
   int linenumber;
diff --git a/src/lisp/lisp.cpp b/src/lisp/lisp.cpp
index b02b50fae..0f87a7073 100644
--- a/src/lisp/lisp.cpp
+++ b/src/lisp/lisp.cpp
@@ -20,8 +20,9 @@
 
 namespace lisp {
 
-Lisp::Lisp(LispType newtype)
-  : type(newtype)
+Lisp::Lisp(LispType newtype) :
+  type(newtype),
+  v()
 {
 }
 
diff --git a/src/lisp/list_iterator.cpp b/src/lisp/list_iterator.cpp
index 218fad167..c344fa04e 100644
--- a/src/lisp/list_iterator.cpp
+++ b/src/lisp/list_iterator.cpp
@@ -19,8 +19,10 @@
 
 namespace lisp {
 
-ListIterator::ListIterator(const lisp::Lisp* newlisp)
-  : current_lisp(0), cur(newlisp)
+ListIterator::ListIterator(const lisp::Lisp* newlisp) :
+  current_item(),
+  current_lisp(0), 
+  cur(newlisp)
 {
 }
 
diff --git a/src/lisp/parser.cpp b/src/lisp/parser.cpp
index 28ebd2511..294d9aa38 100644
--- a/src/lisp/parser.cpp
+++ b/src/lisp/parser.cpp
@@ -27,8 +27,13 @@
 
 namespace lisp {
 
-Parser::Parser(bool translate)
-  : lexer(0), dictionary_manager(0), dictionary(0)
+Parser::Parser(bool translate) :
+  lexer(0), 
+  filename(),
+  dictionary_manager(0), 
+  dictionary(0),
+  token(),
+  obst()
 {
   if(translate) {
     dictionary_manager = new TinyGetText::DictionaryManager();
diff --git a/src/lisp/parser.hpp b/src/lisp/parser.hpp
index 9b2670866..cbc89afd5 100644
--- a/src/lisp/parser.hpp
+++ b/src/lisp/parser.hpp
@@ -52,6 +52,8 @@ private:
   void parse_error(const char* msg) const __attribute__((__noreturn__));
   const Lisp* read();
 
+
+private:
   Lexer* lexer;
   std::string filename;
   TinyGetText::DictionaryManager* dictionary_manager;
diff --git a/src/lisp/writer.cpp b/src/lisp/writer.cpp
index 41854d319..5b4d8fba5 100644
--- a/src/lisp/writer.cpp
+++ b/src/lisp/writer.cpp
@@ -21,7 +21,11 @@
 
 namespace lisp {
 
-Writer::Writer(const std::string& filename)
+Writer::Writer(const std::string& filename) :
+  out(),
+  out_owned(),
+  indent_depth(),
+  lists()
 {
   out = new OFileStream(filename);
   out_owned = true;
@@ -29,7 +33,11 @@ Writer::Writer(const std::string& filename)
   out->precision(10);
 }
 
-Writer::Writer(std::ostream* newout)
+Writer::Writer(std::ostream* newout) :
+  out(),
+  out_owned(),
+  indent_depth(),
+  lists()
 {
   out = newout;
   out_owned = false;
diff --git a/src/lisp/writer.hpp b/src/lisp/writer.hpp
index a0db57df5..a9909a748 100644
--- a/src/lisp/writer.hpp
+++ b/src/lisp/writer.hpp
@@ -52,6 +52,7 @@ private:
   void write_escaped_string(const std::string& str);
   void indent();
 
+private:
   std::ostream* out;
   bool out_owned;
   int indent_depth;
diff --git a/src/object/ambient_sound.cpp b/src/object/ambient_sound.cpp
index 05748fabf..942ab9a26 100644
--- a/src/object/ambient_sound.cpp
+++ b/src/object/ambient_sound.cpp
@@ -26,7 +26,20 @@
 #include "supertux/sector.hpp"
 #include "util/reader.hpp"
 
-AmbientSound::AmbientSound(const Reader& lisp)
+AmbientSound::AmbientSound(const Reader& lisp) :
+  name(),
+  position(),
+  dimension(),
+  sample(),
+  sound_source(),
+  latency(),
+  distance_factor(),
+  distance_bias(),
+  silence_distance(),
+  maximumvolume(),
+  targetvolume(),
+  currentvolume(),
+  volume_ptr()
 {
   name="";
   position.x = 0;
@@ -80,7 +93,20 @@ AmbientSound::AmbientSound(const Reader& lisp)
   latency=0;
 }
 
-AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file)
+AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std::string file) :
+  name(),
+  position(),
+  dimension(),
+  sample(),
+  sound_source(),
+  latency(),
+  distance_factor(),
+  distance_bias(),
+  silence_distance(),
+  maximumvolume(),
+  targetvolume(),
+  currentvolume(),
+  volume_ptr()
 {
   position.x=pos.x;
   position.y=pos.y;
@@ -105,7 +131,8 @@ AmbientSound::AmbientSound(Vector pos, float factor, float bias, float vol, std:
   latency=0;
 }
 
-AmbientSound::~AmbientSound() {
+AmbientSound::~AmbientSound()
+{
   stop_playing();
 }
 
@@ -115,7 +142,8 @@ AmbientSound::hit(Player& )
 }
 
 void
-AmbientSound::stop_playing() {
+AmbientSound::stop_playing() 
+{
   delete sound_source;
   sound_source = 0;
 }
diff --git a/src/object/ambient_sound.hpp b/src/object/ambient_sound.hpp
index 0b7273b99..cd8eb74de 100644
--- a/src/object/ambient_sound.hpp
+++ b/src/object/ambient_sound.hpp
@@ -84,6 +84,7 @@ protected:
   virtual void stop_playing();
   virtual void expose(HSQUIRRELVM vm, SQInteger table_idx);
   virtual void unexpose(HSQUIRRELVM vm, SQInteger table_idx);
+
 private:
   std::string name; /**< user-defined name for use in scripts or empty string if not scriptable */
   Vector position;
diff --git a/src/object/background.cpp b/src/object/background.cpp
index 20d67b9ac..1c3a9b900 100644
--- a/src/object/background.cpp
+++ b/src/object/background.cpp
@@ -19,13 +19,31 @@
 #include "supertux/object_factory.hpp"
 #include "util/reader.hpp"
 
-Background::Background()
-  : layer(LAYER_BACKGROUND0)
+Background::Background() :
+  layer(LAYER_BACKGROUND0),
+  imagefile_top(),
+  imagefile(),
+  imagefile_bottom(),
+  pos(),
+  speed(),
+  speed_y(),
+  image_top(),
+  image(),
+  image_bottom()
 {
 }
 
-Background::Background(const Reader& reader)
-  : layer(LAYER_BACKGROUND0)
+Background::Background(const Reader& reader) :
+  layer(LAYER_BACKGROUND0),
+  imagefile_top(),
+  imagefile(),
+  imagefile_bottom(),
+  pos(),
+  speed(),
+  speed_y(),
+  image_top(),
+  image(),
+  image_bottom()
 {
   // read position, defaults to (0,0)
   float px = 0;
diff --git a/src/object/electrifier.cpp b/src/object/electrifier.cpp
index bf5dfbb13..919627a6c 100644
--- a/src/object/electrifier.cpp
+++ b/src/object/electrifier.cpp
@@ -17,7 +17,10 @@
 #include "object/electrifier.hpp"
 #include "supertux/sector.hpp"
 
-Electrifier::Electrifier(uint32_t oldtile, uint32_t newtile, float seconds)
+Electrifier::Electrifier(uint32_t oldtile, uint32_t newtile, float seconds) :
+  change_from(),
+  change_to(),
+  duration()
 {
   duration.start(seconds);
   change_from = oldtile;
diff --git a/src/object/electrifier.hpp b/src/object/electrifier.hpp
index 386953660..bcf19ab6a 100644
--- a/src/object/electrifier.hpp
+++ b/src/object/electrifier.hpp
@@ -28,9 +28,11 @@ class Electrifier : public GameObject
 public:
   Electrifier(uint32_t oldtile, uint32_t newtile, float seconds);
   ~Electrifier();
+
 protected:
   virtual void update(float time);
   virtual void draw(DrawingContext& context);
+
 private:
   uint32_t change_from;
   uint32_t change_to;
diff --git a/src/object/rock.cpp b/src/object/rock.cpp
index 89976dc81..382006361 100644
--- a/src/object/rock.cpp
+++ b/src/object/rock.cpp
@@ -25,6 +25,7 @@ const std::string ROCK_SOUND = "sounds/brick.wav"; //TODO use own sound.
 
 Rock::Rock(const Vector& pos, std::string spritename) :
   MovingSprite(pos, spritename),
+  physic(),
   on_ground(),
   grabbed(),
   last_movement()
diff --git a/src/object/skull_tile.cpp b/src/object/skull_tile.cpp
index 6dfecd896..996b127fa 100644
--- a/src/object/skull_tile.cpp
+++ b/src/object/skull_tile.cpp
@@ -24,8 +24,12 @@
 static const float CRACKTIME = 0.3f;
 static const float FALLTIME = 0.8f;
 
-SkullTile::SkullTile(const Reader& lisp)
-  : MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), hit(false), falling(false)
+SkullTile::SkullTile(const Reader& lisp) :
+  MovingSprite(lisp, "images/objects/skull_tile/skull_tile.sprite", LAYER_TILES, COLGROUP_STATIC), 
+  physic(),
+  timer(),
+  hit(false), 
+  falling(false)
 {
 }
 
diff --git a/src/object/smoke_cloud.cpp b/src/object/smoke_cloud.cpp
index 6c282213c..734a029ee 100644
--- a/src/object/smoke_cloud.cpp
+++ b/src/object/smoke_cloud.cpp
@@ -20,6 +20,8 @@
 #include "sprite/sprite_manager.hpp"
 
 SmokeCloud::SmokeCloud(const Vector& pos) :
+  sprite(),
+  timer(),
   position(pos)
 {
   timer.start(.3f);
diff --git a/src/physfs/physfs_stream.hpp b/src/physfs/physfs_stream.hpp
index 9d2ed4736..e5f727603 100644
--- a/src/physfs/physfs_stream.hpp
+++ b/src/physfs/physfs_stream.hpp
@@ -38,6 +38,10 @@ protected:
 private:
   PHYSFS_file* file;
   char buf[1024];
+
+private:
+  IFileStreambuf(const IFileStreambuf&);
+  IFileStreambuf& operator=(const IFileStreambuf&);
 };
 
 class OFileStreambuf : public std::streambuf
@@ -53,6 +57,10 @@ protected:
 private:
   PHYSFS_file* file;
   char buf[1024];
+
+private:
+  OFileStreambuf(const OFileStreambuf&);
+  OFileStreambuf& operator=(const OFileStreambuf&);
 };
 
 class IFileStream : public std::istream
diff --git a/src/scripting/wind.hpp b/src/scripting/wind.hpp
index 517ba3f21..cac409707 100644
--- a/src/scripting/wind.hpp
+++ b/src/scripting/wind.hpp
@@ -40,10 +40,14 @@ public:
 
 #ifndef SCRIPTING_API
   _Wind* wind;
+
+private:
+  Wind(const Wind&);
+  Wind& operator=(const Wind&);
 #endif
 };
 
-}
+} // namespace Scripting
 
 #endif
 
diff --git a/src/sprite/sprite.hpp b/src/sprite/sprite.hpp
index 8051a0276..6e90a8471 100644
--- a/src/sprite/sprite.hpp
+++ b/src/sprite/sprite.hpp
@@ -100,14 +100,14 @@ public:
   int get_frame() const
   { return (int)frame; }
   /** Set current frame */
-  void set_frame(int frame)
+  void set_frame(int frame_)
   {
-    this->frame = (float) (frame % get_frames());
+    this->frame = (float) (frame_ % get_frames());
   }
-  Surface* get_frame(unsigned int frame)
+  Surface* get_frame(unsigned int frame_)
   {
-    assert(frame < action->surfaces.size());
-    return action->surfaces[frame];
+    assert(frame_ < action->surfaces.size());
+    return action->surfaces[frame_];
   }
 
 private:
diff --git a/src/supertux/collision.hpp b/src/supertux/collision.hpp
index fdecaef21..ac365f7aa 100644
--- a/src/supertux/collision.hpp
+++ b/src/supertux/collision.hpp
@@ -29,7 +29,14 @@ namespace collision {
 class Constraints
 {
 public:
-  Constraints() {
+  Constraints() :
+    left(),
+    right(),
+    top(),
+    bottom(),
+    ground_movement(),
+    hit()
+  {
     float infinity = (std::numeric_limits<float>::has_infinity ? 
                       std::numeric_limits<float>::infinity() : 
                       std::numeric_limits<float>::max());
@@ -39,14 +46,19 @@ public:
     bottom = infinity;
   }
 
-  bool has_constraints() const {
+  bool has_constraints() const 
+  {
     float infinity = (std::numeric_limits<float>::has_infinity ?
                       std::numeric_limits<float>::infinity() : 
                       std::numeric_limits<float>::max());
-    return left > -infinity || right < infinity
-      || top > -infinity || bottom < infinity;
+    return
+      left   > -infinity || 
+      right  <  infinity || 
+      top    > -infinity || 
+      bottom <  infinity;
   }
 
+public:
   float left;
   float right;
   float top;
diff --git a/src/supertux/levelintro.hpp b/src/supertux/levelintro.hpp
index 5afee4cc1..e39decf51 100644
--- a/src/supertux/levelintro.hpp
+++ b/src/supertux/levelintro.hpp
@@ -51,6 +51,10 @@ private:
   float player_sprite_py; /**< Position (y axis) for the player sprite */
   float player_sprite_vy; /**< Velocity (y axis) for the player sprite */
   Timer player_sprite_jump_timer; /**< When timer fires, the player sprite will "jump" */
+
+private:
+  LevelIntro(const LevelIntro&);
+  LevelIntro& operator=(const LevelIntro&);
 };
 
 #endif
diff --git a/src/supertux/shrinkfade.cpp b/src/supertux/shrinkfade.cpp
index 5c6a30d7a..e83d08150 100644
--- a/src/supertux/shrinkfade.cpp
+++ b/src/supertux/shrinkfade.cpp
@@ -18,8 +18,14 @@
 #include "supertux/shrinkfade.hpp"
 #include "video/drawing_context.hpp"
 
-ShrinkFade::ShrinkFade(const Vector& dest, float fade_time)
-  : dest(dest), fade_time(fade_time), accum_time(0)
+ShrinkFade::ShrinkFade(const Vector& dest, float fade_time) :
+  dest(dest), 
+  fade_time(fade_time), 
+  accum_time(0),
+  speedleft(),
+  speedright(),
+  speedtop(),
+  speedbottom()
 {
   speedleft = dest.x / fade_time;
   speedright = (SCREEN_WIDTH - dest.x) / fade_time;
diff --git a/src/supertux/shrinkfade.hpp b/src/supertux/shrinkfade.hpp
index c29d25502..442eb3459 100644
--- a/src/supertux/shrinkfade.hpp
+++ b/src/supertux/shrinkfade.hpp
@@ -38,7 +38,10 @@ private:
   Vector dest;
   float fade_time;
   float accum_time;
-  float speedleft, speedright, speedtop, speedbottom;
+  float speedleft;
+  float speedright;
+  float speedtop;
+  float speedbottom;
 };
 
 #endif
diff --git a/src/supertux/spawn_point.cpp b/src/supertux/spawn_point.cpp
index 701b058d8..5f36934df 100644
--- a/src/supertux/spawn_point.cpp
+++ b/src/supertux/spawn_point.cpp
@@ -20,11 +20,14 @@
 #include "supertux/spawn_point.hpp"
 #include "util/log.hpp"
 
-SpawnPoint::SpawnPoint()
+SpawnPoint::SpawnPoint() :
+  name(),
+  pos()
 {}
 
-SpawnPoint::SpawnPoint(const SpawnPoint& other)
-  : name(other.name), pos(other.pos)
+SpawnPoint::SpawnPoint(const SpawnPoint& other) :
+  name(other.name), 
+  pos(other.pos)
 {}
 
 SpawnPoint::SpawnPoint(const lisp::Lisp* slisp)
diff --git a/src/supertux/textscroller.hpp b/src/supertux/textscroller.hpp
index 6237ab7a4..c6d2d2703 100644
--- a/src/supertux/textscroller.hpp
+++ b/src/supertux/textscroller.hpp
@@ -49,6 +49,10 @@ private:
   Color color;
   std::string text;
   Surface* image;
+
+private:
+  InfoBoxLine(const InfoBoxLine&);
+  InfoBoxLine& operator=(const InfoBoxLine&);
 };
 
 /** This class is displaying a box with information text inside the game
@@ -71,6 +75,10 @@ private:
   std::map<std::string, Surface*> images;
   Surface* arrow_scrollup;
   Surface* arrow_scrolldown;
+
+private:
+  InfoBox(const InfoBox&);
+  InfoBox& operator=(const InfoBox&);
 };
 
 /**
diff --git a/src/video/color.hpp b/src/video/color.hpp
index 434c03e82..ef751b6f5 100644
--- a/src/video/color.hpp
+++ b/src/video/color.hpp
@@ -32,11 +32,11 @@ public:
     alpha(1.0f)
   {}
 
-  Color(float red, float green, float blue, float alpha = 1.0) :
-    red(red),
-    green(green), 
-    blue(blue), 
-    alpha(alpha)
+  Color(float red_, float green_, float blue_, float alpha_ = 1.0) :
+    red(red_),
+    green(green_), 
+    blue(blue_), 
+    alpha(alpha_)
   {
 #ifdef DEBUG
     check_color_ranges();
diff --git a/src/video/font.cpp b/src/video/font.cpp
index e1bac5a46..05a8286d6 100644
--- a/src/video/font.cpp
+++ b/src/video/font.cpp
@@ -100,10 +100,13 @@ bool vline_empty(SDL_Surface* surface, int x, int start_y, int end_y, Uint8 thre
 
 Font::Font(GlyphWidth glyph_width_,
            const std::string& filename,
-           int shadowsize_)
-  :   glyph_width(glyph_width_),
-      shadowsize(shadowsize_),
-      glyphs(65536)
+           int shadowsize_) :
+  glyph_width(glyph_width_),
+  glyph_surfaces(),
+  shadow_surfaces(),
+  char_height(),
+  shadowsize(shadowsize_),
+  glyphs(65536)
 {
   for(unsigned int i=0; i<65536;i++) glyphs[i].surface_idx = -1;
 
diff --git a/src/video/font.hpp b/src/video/font.hpp
index f521797a1..62b5d91c1 100644
--- a/src/video/font.hpp
+++ b/src/video/font.hpp
@@ -43,6 +43,7 @@ public:
     VARIABLE
   };
 
+public:
   /** Construct a fixed-width font
    *
    *  @param glyph_width  VARIABLE for proportional fonts, VARIABLE for monospace ones
@@ -100,13 +101,13 @@ private:
                   const Vector& position, DrawingEffect drawing_effect, Color color,
                   float alpha) const;
 
-  GlyphWidth glyph_width;
-
-  std::vector<Surface>  glyph_surfaces;
-  std::vector<Surface>  shadow_surfaces;
-  int char_height;
-  int shadowsize;
-
+  void loadFontFile(const std::string &filename);
+  void loadFontSurface(const std::string &glyphimage,
+                       const std::string &shadowimage,
+                       const std::vector<std::string> &chars,
+                       GlyphWidth glyph_width,
+                       int char_width);
+private:
   struct Glyph {
     /** How many pixels should the cursor advance after printing the
         glyph */
@@ -120,17 +121,25 @@ private:
 
     /** Position of the glyph inside the surface */
     Rect rect;
+
+    Glyph() :
+      advance(),
+      offset(),
+      surface_idx(),
+      rect()
+    {}
   };
 
+private:
+  GlyphWidth glyph_width;
+
+  std::vector<Surface>  glyph_surfaces;
+  std::vector<Surface>  shadow_surfaces;
+  int char_height;
+  int shadowsize;
+
   /** 65536 of glyphs */
   std::vector<Glyph> glyphs;
- 
-  void loadFontFile(const std::string &filename);
-  void loadFontSurface(const std::string &glyphimage,
-                       const std::string &shadowimage,
-                       const std::vector<std::string> &chars,
-                       GlyphWidth glyph_width,
-                       int char_width);
 };
 
 #endif
diff --git a/src/video/gl/gl_texture.cpp b/src/video/gl/gl_texture.cpp
index 1dbada196..b0ce080f8 100644
--- a/src/video/gl/gl_texture.cpp
+++ b/src/video/gl/gl_texture.cpp
@@ -34,13 +34,18 @@ inline int next_power_of_two(int val)
 
 } // namespace
 
-GLTexture::GLTexture(unsigned int width, unsigned int height)
+GLTexture::GLTexture(unsigned int width, unsigned int height) :
+  handle(),
+  texture_width(),
+  texture_height(),
+  image_width(),
+  image_height()
 {
   assert(is_power_of_2(width));
   assert(is_power_of_2(height));
-  texture_width = width;
+  texture_width  = width;
   texture_height = height;
-  image_width = width;
+  image_width  = width;
   image_height = height;
 
   assert_gl("before creating texture");
@@ -59,7 +64,12 @@ GLTexture::GLTexture(unsigned int width, unsigned int height)
   }
 }
 
-GLTexture::GLTexture(SDL_Surface* image)
+GLTexture::GLTexture(SDL_Surface* image) :
+  handle(),
+  texture_width(),
+  texture_height(),
+  image_width(),
+  image_height()
 {
   texture_width = next_power_of_two(image->w);
   texture_height = next_power_of_two(image->h);
diff --git a/src/video/sdl/sdl_lightmap.cpp b/src/video/sdl/sdl_lightmap.cpp
index a5e15edb4..4c6234d7f 100644
--- a/src/video/sdl/sdl_lightmap.cpp
+++ b/src/video/sdl/sdl_lightmap.cpp
@@ -20,7 +20,16 @@
 #include "video/sdl/sdl_surface_data.hpp"
 #include "video/sdl/sdl_texture.hpp"
 
-SDLLightmap::SDLLightmap()
+SDLLightmap::SDLLightmap() :
+  screen(),
+  red_channel(),
+  blue_channel(),
+  green_channel(),
+  width(),
+  height(),
+  numerator(),
+  denominator(),
+  LIGHTMAP_DIV()
 {
   screen = SDL_GetVideoSurface();
 
diff --git a/src/video/sdl/sdl_lightmap.hpp b/src/video/sdl/sdl_lightmap.hpp
index 65983f256..4719c38b3 100644
--- a/src/video/sdl/sdl_lightmap.hpp
+++ b/src/video/sdl/sdl_lightmap.hpp
@@ -43,11 +43,17 @@ private:
   Uint8 *red_channel;
   Uint8 *blue_channel;
   Uint8 *green_channel;
-  int width, height;
-  int numerator, denominator;
+  int width;
+  int height;
+  int numerator;
+  int denominator;
   int LIGHTMAP_DIV;
 
   void light_blit(SDL_Surface *src, SDL_Rect *src_rect, int dstx, int dsty);
+
+private:
+  SDLLightmap(const SDLLightmap&);
+  SDLLightmap& operator=(const SDLLightmap&);
 };
 
 #endif
diff --git a/src/video/sdl/sdl_texture.hpp b/src/video/sdl/sdl_texture.hpp
index 70bc869f6..9f3a66737 100644
--- a/src/video/sdl/sdl_texture.hpp
+++ b/src/video/sdl/sdl_texture.hpp
@@ -130,6 +130,10 @@ public:
     {
     return height;
     }*/
+
+private:
+  SDLTexture(const SDLTexture&);
+  SDLTexture& operator=(const SDLTexture&);
 };
 
 #endif
diff --git a/src/worldmap/level.cpp b/src/worldmap/level.cpp
index 90383ba6b..8a4330e8f 100644
--- a/src/worldmap/level.cpp
+++ b/src/worldmap/level.cpp
@@ -29,8 +29,13 @@
 namespace WorldMapNS {
 
 LevelTile::LevelTile(const std::string& basedir, const lisp::Lisp* lisp) :
+  pos(),
+  title(),
   solved(false), 
   auto_play(false), 
+  sprite(),
+  statistics(),
+  extro_script(),
   basedir(basedir), 
   picture_cached(false),
   picture(0)
diff --git a/src/worldmap/level.hpp b/src/worldmap/level.hpp
index 5abf3c039..9d9db4f3c 100644
--- a/src/worldmap/level.hpp
+++ b/src/worldmap/level.hpp
@@ -39,6 +39,10 @@ public:
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
+  /** return Surface of level picture or 0 if no picture is available */
+  const Surface* get_picture();
+
+public:
   Vector pos;
   std::string title;
   bool solved;
@@ -52,9 +56,6 @@ public:
   /** Script that is run when the level is successfully finished */
   std::string extro_script;
 
-  /** return Surface of level picture or 0 if no picture is available */
-  const Surface* get_picture();
-
 private:
   std::string basedir;
   bool picture_cached;
diff --git a/src/worldmap/special_tile.cpp b/src/worldmap/special_tile.cpp
index 3022214e6..9bc419d72 100644
--- a/src/worldmap/special_tile.cpp
+++ b/src/worldmap/special_tile.cpp
@@ -23,10 +23,17 @@
 
 namespace WorldMapNS {
 
-SpecialTile::SpecialTile(const lisp::Lisp* lisp)
-  : passive_message(false), invisible(false),
-    apply_action_north(true), apply_action_east(true),
-    apply_action_south(true), apply_action_west(true)
+SpecialTile::SpecialTile(const lisp::Lisp* lisp) :
+  pos(),
+  sprite(),
+  map_message(),
+  passive_message(false), 
+  script(),
+  invisible(false),
+  apply_action_north(true), 
+  apply_action_east(true),
+  apply_action_south(true), 
+  apply_action_west(true)
 {
   lisp->get("x", pos.x);
   lisp->get("y", pos.y);
diff --git a/src/worldmap/special_tile.hpp b/src/worldmap/special_tile.hpp
index ee08f60eb..b2ea7ffd2 100644
--- a/src/worldmap/special_tile.hpp
+++ b/src/worldmap/special_tile.hpp
@@ -38,6 +38,7 @@ public:
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
+public:
   Vector pos;
 
   /** Sprite to render instead of guessing what image to draw */
@@ -60,7 +61,7 @@ public:
   bool apply_action_west;
 };
 
-}
+} // namespace WorldMapNS
 
 #endif
 
diff --git a/src/worldmap/sprite_change.cpp b/src/worldmap/sprite_change.cpp
index 6aff3c640..18c10cf41 100644
--- a/src/worldmap/sprite_change.cpp
+++ b/src/worldmap/sprite_change.cpp
@@ -22,8 +22,13 @@
 
 namespace WorldMapNS {
 
-SpriteChange::SpriteChange(const lisp::Lisp* lisp)
-  : change_on_touch(false), in_stay_action(false)
+SpriteChange::SpriteChange(const lisp::Lisp* lisp) :
+  pos(),
+  change_on_touch(false), 
+  sprite(),
+  stay_action(),
+  stay_group(),
+  in_stay_action(false)
 {
   lisp->get("x", pos.x);
   lisp->get("y", pos.y);
diff --git a/src/worldmap/sprite_change.hpp b/src/worldmap/sprite_change.hpp
index 1e2eb89ed..4f22ae1c2 100644
--- a/src/worldmap/sprite_change.hpp
+++ b/src/worldmap/sprite_change.hpp
@@ -35,27 +35,6 @@ public:
   SpriteChange(const lisp::Lisp* lisp);
   virtual ~SpriteChange();
 
-  Vector pos;
-  /**
-   * should tuxs sprite change when the tile has been completely entered,
-   * or already when the tile was just touched
-   */
-  bool change_on_touch;
-  /// sprite to change tux image to
-  std::auto_ptr<Sprite> sprite;
-  /**
-   * stay action can be used for objects like boats or cars, if it is
-   * != "" then this sprite will be displayed when tux left the tile towards
-   * another SpriteChange object.
-   */
-  std::string stay_action;
-
-  /**
-   * name of a group in which only one SpriteChange will ever have its stay_action displayed.
-   * Leave empty if you don't care.
-   */
-  std::string stay_group;
-
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
@@ -69,17 +48,34 @@ public:
    */
   void clear_stay_action();
 
+public:
+  Vector pos;
+
+  /** should tuxs sprite change when the tile has been completely entered,
+      or already when the tile was just touched */
+  bool change_on_touch;
+
+  /** sprite to change tux image to */
+  std::auto_ptr<Sprite> sprite;
+
+  /** stay action can be used for objects like boats or cars, if it is
+      != "" then this sprite will be displayed when tux left the tile
+      towards another SpriteChange object. */
+  std::string stay_action;
+
+  /** name of a group in which only one SpriteChange will ever have
+      its stay_action displayed.  Leave empty if you don't care. */
+  std::string stay_group;
+
 private:
-  /**
-   * should the stayaction be displayed
-   */
+  /** should the stayaction be displayed */
   bool in_stay_action;
 
+private:
   static std::list<SpriteChange*> all_sprite_changes;
-
 };
 
-}
+} // namespace WorldMapNS
 
 #endif
 
diff --git a/src/worldmap/teleporter.cpp b/src/worldmap/teleporter.cpp
index b4425ed6e..832fd6b42 100644
--- a/src/worldmap/teleporter.cpp
+++ b/src/worldmap/teleporter.cpp
@@ -22,8 +22,13 @@
 
 namespace WorldMapNS {
 
-Teleporter::Teleporter(const lisp::Lisp* lisp)
-  : automatic(false)
+Teleporter::Teleporter(const lisp::Lisp* lisp) :
+  pos(),
+  sprite(),
+  worldmap(),
+  spawnpoint(),
+  automatic(false),
+  message()
 {
   lisp->get("x", pos.x);
   lisp->get("y", pos.y);
@@ -50,6 +55,6 @@ Teleporter::update(float )
 {
 }
 
-}
+} // namespace WorldMapNS
 
 /* EOF */
diff --git a/src/worldmap/teleporter.hpp b/src/worldmap/teleporter.hpp
index b9aa262c8..0ab3d2576 100644
--- a/src/worldmap/teleporter.hpp
+++ b/src/worldmap/teleporter.hpp
@@ -36,6 +36,7 @@ public:
   virtual void draw(DrawingContext& context);
   virtual void update(float elapsed_time);
 
+public:
   /** Position (in tiles, not pixels) */
   Vector pos;
 
@@ -53,10 +54,9 @@ public:
 
   /** optional map message to display */
   std::string message;
-
 };
 
-}
+} // namespace WorldMapNS
 
 #endif
 
-- 
2.11.0