[Adonthell-commits] CVS: adonthell/src data_screen.cc,1.21,1.22 fileops.cc,1.6,1.7 gamedata.cc,1.17,1.18

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/adonthell/src
In directory subversions:/tmp/cvs-serv6887

Modified Files:
        data_screen.cc fileops.cc gamedata.cc 
Log Message:
INCREASED version number of character.data
FIXED crash when trying to load outdated saved game


Index: data_screen.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/data_screen.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** data_screen.cc      2 Nov 2001 13:56:43 -0000       1.21
--- data_screen.cc      25 Apr 2002 19:30:08 -0000      1.22
***************
*** 239,243 ****
          data::engine->fade_out ();
          set_visible (false);
!         gamedata::load (pos);
          data::engine->main_quit ();
      }
--- 239,243 ----
          data::engine->fade_out ();
          set_visible (false);
!         if (!gamedata::load (pos)) aborted = true;
          data::engine->main_quit ();
      }

Index: fileops.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/fileops.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** fileops.cc  12 Apr 2002 20:02:51 -0000      1.6
--- fileops.cc  25 Apr 2002 19:30:08 -0000      1.7
***************
*** 276,280 ****
      if (vinfo != 'v')
      {
!       cerr << "Version information missing in file \"" << name << endl;
          cerr << "You should get a more recent data package.\n";
          return false;
--- 276,280 ----
      if (vinfo != 'v')
      {
!         cerr << "Version information missing in file \"" << name << endl;
          cerr << "You should get a more recent data package.\n";
          return false;
***************
*** 286,298 ****
      if (version < min || version > max)
      {
!       cerr << "File \"" << name << "\" has version number " << version << 
",\n";
          cerr <<  "but I was expecting " << min << " <= version <= " << max << 
endl;
        
          // file is newer than code
          if (version > max)
!             cerr << "You should get an up-to-date version of this program.\n";
          // file is older than code
          else
!             cerr << "You should get a more recent data package.\n";
  
          return false;
--- 286,298 ----
      if (version < min || version > max)
      {
!         cerr << "File \"" << name << "\" has\nversion number " << version << 
", ";
          cerr <<  "but I was expecting " << min << " <= version <= " << max << 
endl;
        
          // file is newer than code
          if (version > max)
!             cerr << "You should get an up-to-date version of this 
program.\n\n";
          // file is older than code
          else
!             cerr << "You should propably get a more recent data package.\n";
  
          return false;

Index: gamedata.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gamedata.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** gamedata.cc 26 Jan 2002 21:52:07 -0000      1.17
--- gamedata.cc 25 Apr 2002 19:30:08 -0000      1.18
***************
*** 38,42 ****
  #define ENGINE_DAT_VER  1
  #define AUDIO_DAT_VER   2
! #define CHAR_DAT_VER    3
  #define QUEST_DAT_VER   1
  #define SAVE_DAT_VER    2
--- 38,42 ----
  #define ENGINE_DAT_VER  1
  #define AUDIO_DAT_VER   2
! #define CHAR_DAT_VER    4
  #define QUEST_DAT_VER   1
  #define SAVE_DAT_VER    2