[Enigma-cvs] enigma/src levels.hh,1.5,1.6

[Ralf Westram <address@hidden>]

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

Modified Files:
        levels.hh 
Log Message:
- best_time -> best_time_easy + best_time_normal



Index: levels.hh
===================================================================
RCS file: /cvsroot/enigma/enigma/src/levels.hh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** levels.hh   30 Oct 2003 19:05:49 -0000      1.5
--- levels.hh   3 Nov 2003 14:22:29 -0000       1.6
***************
*** 57,61 ****
          int      revision;      // Revision # of this level
          bool     has_easymode;  // whether level has an easymode
!         int      best_time;     // Best time in seconds
          int      best_moves;    // Least moves to solve level
          string   hint1, hint2;  // Hints for solving this level
--- 57,62 ----
          int      revision;      // Revision # of this level
          bool     has_easymode;  // whether level has an easymode
!         int      best_time_easy; // Best time in seconds (for easy mode)
!         int      best_time_normal; // (for normal mode)
          int      best_moves;    // Least moves to solve level
          string   hint1, hint2;  // Hints for solving this level
***************
*** 70,74 ****
                    int            rev,
                    bool           easy,
!                   int            par_time,
                    int            par_moves,
                    const string&  h1,
--- 71,76 ----
                    int            rev,
                    bool           easy,
!                   int            par_time_easy,
!                   int            par_time_normal,
                    int            par_moves,
                    const string&  h1,
***************
*** 76,80 ****
              : type(gt), filename(fn), name(n), author(a), revision(rev),
                has_easymode(easy),
!               best_time(par_time == -1 ? DEFAULT_TIME : par_time),
                best_moves(par_moves), hint1(h1), hint2(h2)
          {
--- 78,83 ----
              : type(gt), filename(fn), name(n), author(a), revision(rev),
                has_easymode(easy),
!               best_time_easy(par_time_easy == -1 ? DEFAULT_TIME : 
par_time_easy),
!               best_time_normal(par_time_normal == -1 ? DEFAULT_TIME : 
par_time_normal),
                best_moves(par_moves), hint1(h1), hint2(h2)
          {
***************
*** 82,89 ****
  
          LevelInfo() {
!           type         = GAMET_ENIGMA;
!             revision     = 0;
!             has_easymode = false;
!             best_time    = DEFAULT_TIME;
          }
      };
--- 85,93 ----
  
          LevelInfo() {
!           type             = GAMET_ENIGMA;
!             revision         = 0;
!             has_easymode     = false;
!             best_time_easy   = DEFAULT_TIME;
!             best_time_normal = DEFAULT_TIME;
          }
      };