[Pingus-CVS] CVS: Games/Pingus/src alpha_button.cxx,1.1,1.2 button_panel.cxx,1.3,1.4 client.cxx,1.2,1.3 col_map.cxx,1.2,1.3 console.hxx,1.1,1.2 counter.cxx,1.2,1.3 credits.cxx,1.1,1.2 debug_gui.cxx,1.1,1.2 demo_player.hxx,1.1,1.2 demo_recorder.cxx,1.2,1.3 direction.cxx,1.1,1.2 display.cxx,1.2,1.3 world.cxx,1.5,1.6

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src
In directory dark:/tmp/cvs-serv18271

Modified Files:
        alpha_button.cxx button_panel.cxx client.cxx col_map.cxx 
        console.hxx counter.cxx credits.cxx debug_gui.cxx 
        demo_player.hxx demo_recorder.cxx direction.cxx display.cxx 
        world.cxx 
Log Message:
- Initialized some unitialized members
- moved some initializations from body to initlist

This fixes the bug that the level end is not recognized and maybe some bugs
in the actions too


Index: alpha_button.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/alpha_button.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- alpha_button.cxx    12 Jun 2002 19:04:10 -0000      1.1
+++ alpha_button.cxx    19 Jun 2002 15:19:26 -0000      1.2
@@ -25,6 +25,7 @@
 #include "alpha_button.hxx"
 
 AlphaButton::AlphaButton(std::string str, int x1, int y1, int w, int h) :
+    pressed(false),
     font  (PingusResource::load_font("Fonts/smallfont_h", "fonts")),
     font_h(PingusResource::load_font("Fonts/smallfont", "fonts")),
     name  (str),

Index: button_panel.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/button_panel.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- button_panel.cxx    17 Jun 2002 15:45:26 -0000      1.3
+++ button_panel.cxx    19 Jun 2002 15:19:26 -0000      1.4
@@ -32,7 +32,9 @@
 
 ButtonPanel::ButtonPanel(PLF* plf, Controller* arg_controller,
                                         int arg_x_pos, int arg_y_pos)
-  : last_press(0),
+  : armageddon_pressed(false),
+    left_pressed(0),
+    last_press(0),
     controller (arg_controller),
     x_pos (arg_x_pos), 
     y_pos (arg_y_pos)
@@ -64,9 +66,8 @@
 
   forward->pressed = false;
   pause->pressed   = false;
-  armageddon_pressed = false;
+    
   
-  left_pressed = 0;
   
   pressed_button = a_buttons.begin();
 }

Index: client.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/client.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- client.cxx  13 Jun 2002 14:25:12 -0000      1.2
+++ client.cxx  19 Jun 2002 15:19:26 -0000      1.3
@@ -41,15 +41,12 @@
 #include "button_panel.hxx"
 
 Client::Client(Controller* arg_controller, Server * s)
-  : // plf ?
-    // result ?
-    server       (s),
+  : server       (s),
     fast_forward (false),
     pause        (false),
     skip_frame   (0),
     do_replay    (false),
     is_finished  (false),
-    // obj ?
     button_panel (0),
     pcounter     (0),
     playfield    (0),
@@ -58,7 +55,6 @@
     hurry_up     (0),
     controller   (arg_controller),
     cursor       (new Cursor ("cursors/animcross", "core", controller))
-    // slot_x ?
 {
   //player = 0;
  

Index: col_map.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/col_map.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- col_map.cxx 13 Jun 2002 14:25:12 -0000      1.2
+++ col_map.cxx 19 Jun 2002 15:19:26 -0000      1.3
@@ -29,9 +29,8 @@
 #include "my_gettext.hxx"
 
 
-ColMap::ColMap()
+ColMap::ColMap() : init(false)
 {
-  init = false;
 }
 
 // Obtain the colmap from a memory area

Index: console.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/console.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- console.hxx 12 Jun 2002 19:09:37 -0000      1.1
+++ console.hxx 19 Jun 2002 15:19:26 -0000      1.2
@@ -34,7 +34,7 @@
 {
 private:
   std::string current_line;
-  bool continue_last;
+  //bool continue_last;
   std::vector<std::string> buffer;
   char char_buffer[CONSOLE_BUFFER_SIZE];
   

Index: counter.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/counter.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- counter.cxx 13 Jun 2002 14:25:12 -0000      1.2
+++ counter.cxx 19 Jun 2002 15:19:26 -0000      1.3
@@ -20,12 +20,8 @@
 #include <iostream>
 #include "counter.hxx"
 
-Counter::Counter()
+Counter::Counter() : s(1), count(0), add(1), type(loop)
 {
-  add = 1;
-  s = 1;
-  count = 0;
-  type = loop;
 }
 
 Counter::Counter(int a)

Index: credits.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/credits.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- credits.cxx 12 Jun 2002 19:09:37 -0000      1.1
+++ credits.cxx 19 Jun 2002 15:19:26 -0000      1.2
@@ -36,9 +36,8 @@
 
 Credits credit_screen;
 
-Credits::Credits()
+Credits::Credits() : is_init(false)
 {  
-  is_init = false;
 }
 
 ///

Index: debug_gui.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/debug_gui.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- debug_gui.cxx       12 Jun 2002 19:09:37 -0000      1.1
+++ debug_gui.cxx       19 Jun 2002 15:19:26 -0000      1.2
@@ -22,10 +22,8 @@
 
 #include "debug_gui.hxx"
 
-DebugGui::DebugGui(void)
+DebugGui::DebugGui(void) : 
font(PingusResource::load_font("Fonts/smallfont","fonts")), debug_active(false)
 {
-  font = PingusResource::load_font("Fonts/smallfont","fonts");
-  debug_active = false;
 }
 
 DebugGui::~DebugGui()

Index: demo_player.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_player.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- demo_player.hxx     12 Jun 2002 19:09:37 -0000      1.1
+++ demo_player.hxx     19 Jun 2002 15:19:26 -0000      1.2
@@ -33,7 +33,7 @@
   ///
   std::string levelname;
   ///
-  bool is_playing;
+  //bool is_playing;
 
 public:
   ///

Index: demo_recorder.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_recorder.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- demo_recorder.cxx   13 Jun 2002 14:25:12 -0000      1.2
+++ demo_recorder.cxx   19 Jun 2002 15:19:26 -0000      1.3
@@ -30,9 +30,8 @@
 
 using namespace std;
 
-DemoRecorder::DemoRecorder()
+DemoRecorder::DemoRecorder() : is_recording(false)
 {
-  is_recording = false;
 }
 
 DemoRecorder::~DemoRecorder()

Index: direction.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/direction.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- direction.cxx       12 Jun 2002 19:09:37 -0000      1.1
+++ direction.cxx       19 Jun 2002 15:19:26 -0000      1.2
@@ -19,9 +19,8 @@
 
 #include "direction.hxx"
 
-Direction::Direction()
+Direction::Direction() : direction(0)
 {
-  direction = 0;
 }
 
 Direction::Direction(const Direction& dir)

Index: display.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/display.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- display.cxx 13 Jun 2002 14:25:12 -0000      1.2
+++ display.cxx 19 Jun 2002 15:19:26 -0000      1.3
@@ -28,9 +28,8 @@
 list<DisplayHook*> Display::display_hooks;
 bool Display::displaying_cursor = false;
 
-DisplayHook::DisplayHook()
+DisplayHook::DisplayHook() : is_visible(false)
 {
-  is_visible = false;
 }
 
 void

Index: world.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/world.cxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- world.cxx   17 Jun 2002 15:45:26 -0000      1.5
+++ world.cxx   19 Jun 2002 15:19:26 -0000      1.6
@@ -64,6 +64,7 @@
   // Not perfect, but works
   WorldObj::set_world(this);
 
+  exit_world    = false;
   do_armageddon = false;
   allowed_pingus = plf->get_pingus();
   number_to_save = plf->get_number_to_save();