[Enigma-cvs] enigma/src levelpack.cc,1.8,1.9

[Ralf Westram <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv4629/src

Modified Files:
        levelpack.cc 
Log Message:
- index_*.lua now support a 4th entry (which is the revision number).
  Empty name is sufficiant to comment out a line ('||').
- removed get_moddate, added get_revision_number
- const correctness for get_info



Index: levelpack.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/levelpack.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** levelpack.cc        20 Oct 2003 08:05:45 -0000      1.8
--- levelpack.cc        22 Oct 2003 21:39:22 -0000      1.9
***************
*** 50,56 ****
          bool load_level (size_t index);
  
!         const LevelInfo *get_info (size_t index);
  
!         time_t get_modtime(size_t index);
          int    get_default_SoundSet() const { return 1; }
          bool   needs_twoplayers() const { return false; }
--- 50,56 ----
          bool load_level (size_t index);
  
!         const LevelInfo *get_info (size_t index) const;
  
!         int    get_revision_number(size_t index) const;
          int    get_default_SoundSet() const { return 1; }
          bool   needs_twoplayers() const { return false; }
***************
*** 84,88 ****
          string      get_name() const { return m_name; }
          bool        load_level(size_t idx);
!         time_t      get_modtime(size_t /*idx*/) { return 0; }
      private:
          // Variables
--- 84,88 ----
          string      get_name() const { return m_name; }
          bool        load_level(size_t idx);
!         int         get_revision_number(size_t /*idx*/) const { return 1; }
      private:
          // Variables
***************
*** 105,109 ****
  
  const LevelInfo *
! LevelPack_Enigma::get_info (size_t index) 
  {
      if (index < m_levels.size())
--- 105,109 ----
  
  const LevelInfo *
! LevelPack_Enigma::get_info (size_t index) const
  {
      if (index < m_levels.size())
***************
*** 113,122 ****
  }
  
! time_t
! LevelPack_Enigma::get_modtime(size_t index)
! { // filedate of level
      const LevelInfo *levelinfo = get_info(index);
!     string           filename  = 
enigma::FindDataFile(string("levels/")+levelinfo->filename+".lua");
!     return sysdep::FileModTime(filename);
  }
  
--- 113,121 ----
  }
  
! int
! LevelPack_Enigma::get_revision_number(size_t index) const
! {
      const LevelInfo *levelinfo = get_info(index);
!     return levelinfo->revision;
  }
  
***************
*** 128,134 ****
          vector<string> tokens(4);
          int ntok = split_copy_n (line, '|', tokens.begin(), tokens.size());
!         if (ntok > 0 && ntok <= 3) {
              transform(tokens.begin(), tokens.end(), tokens.begin(), 
trim<string>);
!             m_levels.push_back(LevelInfo(tokens[0], tokens[1], tokens[2], 
GAMET_ENIGMA));
          }
      }
--- 127,135 ----
          vector<string> tokens(4);
          int ntok = split_copy_n (line, '|', tokens.begin(), tokens.size());
!         if (ntok > 0 && ntok <= 4) {
              transform(tokens.begin(), tokens.end(), tokens.begin(), 
trim<string>);
!             if (tokens[0].length() > 0) { // ignore lines where name is empty
!                 m_levels.push_back(LevelInfo(tokens[0], tokens[1], tokens[2], 
tokens[3], GAMET_ENIGMA));
!             }
          }
      }