[Enigma-cvs] enigma/src game.cc,1.54,1.55

[Ralf Westram <address@hidden>]

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

Modified Files:
        game.cc 
Log Message:
- removed revision test (done in get_best_times)
- fixed bug in NextLevel
- cleanup



Index: game.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/game.cc,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** game.cc     9 Nov 2003 12:01:05 -0000       1.54
--- game.cc     12 Nov 2003 09:34:44 -0000      1.55
***************
*** 293,300 ****
              get_best_times(info, stat, par_time, best_user_time, &par_name);
  
-             if (stat && stat->solved_revision < info->revision) {
-                 best_user_time = -1;
-             }
- 
              if (par_time>0) {
                  if (best_user_time<0 || best_user_time>par_time) {
--- 293,296 ----
***************
*** 369,375 ****
                                        skip_solved, take_non_par);
  
-     fprintf(stderr, "take_non_par=%i skip_solved=%i\n", int(take_non_par), 
int(skip_solved));
-     fprintf(stderr, "icurrent_level=%u next_level=%u\n", icurrent_level, 
next_level);
- 
      if (next_level) {
          change_state(load_level(next_level) ? LEVELINFO : ABORT);
--- 365,368 ----
***************
*** 917,921 ****
                  found = levelidx;
              }
!             else {
                  if (select_non_par) {
                      int  par_time, best_user_time;
--- 910,914 ----
                  found = levelidx;
              }
!             else { // solved levels
                  if (select_non_par) {
                      int  par_time, best_user_time;
***************
*** 926,930 ****
                          found = levelidx;
                  }
!                 else if (skip_solved)
                      found = levelidx;
              }
--- 919,923 ----
                          found = levelidx;
                  }
!                 else if (!skip_solved)
                      found = levelidx;
              }