[Adonthell-commits] CVS: adonthell/src adonthell.cc,1.8,1.9 gamedata.cc,1.21,1.22 gamedate.cc,1.3,1.4 mapcharacter.cc,1.43,1.44 mapcharacter.h,1.53,1.54

[Kai Sterker <address@hidden>]

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

Modified Files:
        adonthell.cc gamedata.cc gamedate.cc mapcharacter.cc 
        mapcharacter.h 
Log Message:
ADDED gametime to saved game
IMPROVED schedule disabling when no 'run'Ä method is present


Index: adonthell.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/adonthell.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** adonthell.cc        9 Aug 2002 20:01:26 -0000       1.8
--- adonthell.cc        11 Aug 2002 11:58:21 -0000      1.9
***************
*** 153,156 ****
--- 153,159 ----
  {
      string name;
+     
+     // get the current time
+     gamedate::get_state (file);
  
      // Get the map filename 
***************
*** 174,177 ****
--- 177,183 ----
  s_int8 adonthell::put_state (ogzstream& file)
  {
+     // save the current time
+     gamedate::put_state (file);
+     
      // Save the map filename
      string name = lmap.filename ();

Index: gamedata.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gamedata.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** gamedata.cc 10 Aug 2002 12:18:21 -0000      1.21
--- gamedata.cc 11 Aug 2002 11:58:21 -0000      1.22
***************
*** 38,42 ****
  // File format versions of the various data files
  // *** Increase when changing file format! ***
! #define ENGINE_DAT_VER  2
  #define AUDIO_DAT_VER   2
  #define CHAR_DAT_VER    4
--- 38,42 ----
  // File format versions of the various data files
  // *** Increase when changing file format! ***
! #define ENGINE_DAT_VER  3
  #define AUDIO_DAT_VER   2
  #define CHAR_DAT_VER    4

Index: gamedate.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/gamedate.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** gamedate.cc 10 Aug 2002 12:18:21 -0000      1.3
--- gamedate.cc 11 Aug 2002 11:58:21 -0000      1.4
***************
*** 92,96 ****
  u_int16 gamedate::minute ()
  {
!     return Time % 600; 
  }
  
--- 92,96 ----
  u_int16 gamedate::minute ()
  {
!     return (Time / 10) % 60; 
  }
  

Index: mapcharacter.cc
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapcharacter.cc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** mapcharacter.cc     11 Aug 2002 11:55:04 -0000      1.43
--- mapcharacter.cc     11 Aug 2002 11:58:21 -0000      1.44
***************
*** 181,184 ****
--- 181,185 ----
      
      pathindex << file; 
+     goal_reached_ << file;
      
      // Schedule state
***************
*** 223,227 ****
      mypath.put_state (file);
      pathindex >> file; 
! 
      // Save the schedule script state
      schedule_file () >> file;
--- 224,229 ----
      mypath.put_state (file);
      pathindex >> file; 
!     goal_reached_ >> file;
!     
      // Save the schedule script state
      schedule_file () >> file;
***************
*** 694,698 ****
          }
          schedule.create_instance ("schedules.mapcharacters." + file, file, 
theargs);
!         Py_DECREF (theargs); 
      }
      schedule_file_ = file;
--- 696,703 ----
          }
          schedule.create_instance ("schedules.mapcharacters." + file, file, 
theargs);
!         Py_DECREF (theargs);
!         
!         if (!schedule.has_attribute ("run"))
!             set_schedule_active (false);
      }
      schedule_file_ = file;
***************
*** 734,738 ****
      update_move ();
  
!     if (is_schedule_activated () && schedule.has_attribute ("run")) 
          schedule.run ();
  
--- 739,743 ----
      update_move ();
  
!     if (is_schedule_activated ()) 
          schedule.run ();
  

Index: mapcharacter.h
===================================================================
RCS file: /cvsroot/adonthell/adonthell/src/mapcharacter.h,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** mapcharacter.h      10 Aug 2002 22:02:01 -0000      1.53
--- mapcharacter.h      11 Aug 2002 11:58:21 -0000      1.54
***************
*** 649,652 ****
--- 649,653 ----
      void set_schedule_active (bool a)
      {
+         if (a && !schedule.has_attribute ("run")) return;
          schedule_activated = a; 
      }