[Pingus-CVS] CVS: Games/Pingus/src demo_player.cxx,1.3,1.4 plf.hxx,1.4,1.5 server.cxx,1.14,1.15 server.hxx,1.5,1.6 true_server.cxx,1.7,1.8

[grumbel]

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

Modified Files:
        demo_player.cxx plf.hxx server.cxx server.hxx true_server.cxx 
Log Message:
- removed old and not working demo recording code
- minor cleanups

Index: demo_player.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/demo_player.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- demo_player.cxx     16 Aug 2002 15:13:59 -0000      1.3
+++ demo_player.cxx     14 Sep 2002 23:40:35 -0000      1.4
@@ -18,6 +18,7 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include <iostream>
+#include <fstream>
 #include "pingus_error.hxx"
 #include "demo_player.hxx"
 #include "my_gettext.hxx"
@@ -44,7 +45,7 @@
   const int buffer_size = 256;
   char buffer[buffer_size];
   std::string filename;
-  ifstream in;
+  std::ifstream in;
   
   filename = arg_filename;
 

Index: plf.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/plf.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- plf.hxx     14 Sep 2002 23:31:12 -0000      1.4
+++ plf.hxx     14 Sep 2002 23:40:35 -0000      1.5
@@ -37,21 +37,30 @@
 protected:
   std::map<std::string, std::string> levelname;
 
-  /// The name of the file from were the current level was loaded
+  /** The name of the file from were the current level was loaded */
   std::string filename;
 
-  std::string psm_filename;
   std::map<std::string, std::string> description;
+  
+  /** Author of this level */
   std::string author;
-  ResDescriptor foreground;
+
   ResDescriptor music;
-  ResDescriptor col;
 
+  /** Start x-position of the camera */
   int  start_x_pos;
+  /** Start y-position of the camera */
   int  start_y_pos;
+
+  /** width of the level */
   int  width;
+
+  /** height of the level */
   int  height;
+
+  /** Timelimit for this level */
   int  max_time;
+
   int  release_rate;
   int  number_of_pingus;
   int  number_to_save;
@@ -89,45 +98,39 @@
   PLF();
   virtual ~PLF();
 
-  //ResDescriptor get_foreground(void);
-  ///
-  //ResDescriptor get_mapfile(void);
-  ///
-  //void set_psm_filename(std::string name);
-  
   /** Returns the ResDescriptor where the music for this level can be
       found. The ResDescriptor points normaly to a file. */
   ResDescriptor get_music(void);
 
-  /// Returns the start position for the camera
+  /** Returns the start position for the camera */
   int         get_startx(void);
 
-  /// Returns the start position for the camera
+  /** Returns the start position for the camera */
   int         get_starty(void);
 
-  /// Returns the width of the level
+  /** Returns the width of the level */
   int         get_width(void);
 
-  /// Returns the height of the level
+  /** Returns the height of the level */
   int         get_height(void);
 
   /** Returns the number of Pingus, which are going to be released in
       this level. */
   int         get_pingus(void);
   
-  /// Returns the time you have to complete a level
+  /** Returns the time you have to complete a level */
   int         get_time(void);
 
-  /// Returns the difficulty of the current level
+  /** Returns the difficulty of the current level */
   int         get_difficulty();
 
-  /// Returns if the level is playable
+  /** Returns if the level is playable */
   bool        get_playable();
 
-  /// Returns the maintainer internal comment
+  /** Returns the maintainer internal comment */
   std::string get_comment ();
 
-  /// Returns the number of pingus you need to save in this level.
+  /** Returns the number of pingus you need to save in this level. */
   int         get_number_to_save();
 
   /** Returns the description of the level, which fit to the current
@@ -137,10 +140,10 @@
   /** Returns the name of the current level, {\em not} the level file name. */
   std::map<std::string, std::string> get_levelname();
 
-  /// Returns the name of the plf file.
+  /** Returns the name of the plf file. */
   std::string get_filename();
 
-  /// Returns the name of the author, who creates this level
+  /** Returns the name of the author, who creates this level */
   std::string get_author();
 
   std::vector<ActionData>    get_actions(void);

Index: server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.cxx,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- server.cxx  14 Sep 2002 19:06:33 -0000      1.14
+++ server.cxx  14 Sep 2002 23:40:35 -0000      1.15
@@ -219,25 +219,6 @@
   finished = true;
 }
 
-void
-Server::set_demo(std::string s)
-{
-  demo_mode = true;
-  demo_file = s;
-  //demo_in->open(demo_file, (PingusDemoMode)play);
-
-  std::cout << "Set_demo(): " << demo_file << " file opened" << std::endl;
-}
-
-void 
-Server::record_demo()
-{
-  std::cout << "Recording demo..." << endl;
-  // We do only save the basename of the demofile, not the complete
-  // path, to gain at least a bit portability of the demo files.
-  recorder.set_levelname(System::basename(filename));
-}
-
 ActionHolder*
 Server::get_action_holder()
 {

Index: server.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/server.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- server.hxx  4 Sep 2002 14:55:11 -0000       1.5
+++ server.hxx  14 Sep 2002 23:40:35 -0000      1.6
@@ -21,7 +21,6 @@
 #define HEADER_PINGUS_SERVER_HXX
 
 #include "action_holder.hxx"
-#include "demo_recorder.hxx"
 
 class PLF;
 class World;
@@ -57,11 +56,7 @@
   bool demo_mode;
   std::string demo_file;
 
-  /// The name of the current level file
-  std::string filename;
-
   bool get_next_event;
-  DemoRecorder recorder;
   bool finished;
 
 public:
@@ -90,8 +85,6 @@
   void set_finished();
   void process_event(std::string);
   void send_event(std::string);
-  void set_demo(std::string);
-  void record_demo();
   
 private:
   Server (const Server&);

Index: true_server.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/true_server.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- true_server.cxx     14 Sep 2002 22:41:31 -0000      1.7
+++ true_server.cxx     14 Sep 2002 23:40:35 -0000      1.8
@@ -30,17 +30,9 @@
     plf (arg_plf)
 {
   armageddon = false;
-  filename = plf->get_filename();
   world = 0;
   finished = false;
   client_needs_redraw = true;
-
-  plf = arg_plf;
-  
-  filename = plf->get_filename();
-
-  std::vector<ActionData> bdata;
-
   fast_forward = false;
   pause = false;
   last_time = 0;