[Gcblue-commits] gcb_wx/src/sim Game.cpp,1.130,1.131 tcAirObject.cpp,1.22,1.23 tcPlatformObject.cpp,1.44,1.45 tcSimState.cpp,1.79,1.80

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/sim
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17986/src/sim

Modified Files:
	Game.cpp tcAirObject.cpp tcPlatformObject.cpp tcSimState.cpp 
Log Message:
Landing bug fix, changed /gm create to require starting coords, added fuel to air update

Index: tcSimState.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcSimState.cpp,v
retrieving revision 1.79
retrieving revision 1.80
diff -C2 -d -r1.79 -r1.80
*** tcSimState.cpp	5 May 2005 02:14:55 -0000	1.79
--- tcSimState.cpp	8 May 2005 23:28:59 -0000	1.80
***************
*** 2626,2630 ****
  }
  
! void tcSimState::SetScenarioDescription(std::string s)
  {
      if (s.size() < SCEN_STRING_LENGTH)
--- 2626,2635 ----
  }
  
! const char* tcSimState::GetScenarioDescription() const
! {
! 	return msScenarioInfo.mzDescription;
! }
! 
! void tcSimState::SetScenarioDescription(const std::string& s)
  {
      if (s.size() < SCEN_STRING_LENGTH)
***************
*** 2648,2652 ****
  }
  
! void tcSimState::SetScenarioName(std::string s)
  {
      if (s.size() < 128)
--- 2653,2657 ----
  }
  
! void tcSimState::SetScenarioName(const std::string& s)
  {
      if (s.size() < 128)

Index: tcPlatformObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcPlatformObject.cpp,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** tcPlatformObject.cpp	6 May 2005 23:57:51 -0000	1.44
--- tcPlatformObject.cpp	8 May 2005 23:28:59 -0000	1.45
***************
*** 287,297 ****
      UpdateFormationGuidance(); // formation heading/speed calculation
  
!     UpdateHeading(dt_s);
  
!     UpdateSpeed(dt_s);
  
!     UpdateClimb(dt_s);
  
!     ApplyRestrictions();
  
      Move(dt_s);
--- 287,305 ----
      UpdateFormationGuidance(); // formation heading/speed calculation
  
! 	/* In multiplayer mode, skip command based updates for client objects not controlled
! 	** by client. This will cause object to jump more but avoids having to broadcast command
! 	** changes to all alliance clients. The controller of the object will see smoother
! 	** behavior.
! 	*/
! 	if (!IsClientMode() || IsControlled())
! 	{
! 		UpdateHeading(dt_s);
  
! 		UpdateSpeed(dt_s);
  
! 		UpdateClimb(dt_s);
  
! 		ApplyRestrictions();
! 	}
  
      Move(dt_s);

Index: tcAirObject.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/tcAirObject.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcAirObject.cpp	6 May 2005 23:57:51 -0000	1.22
--- tcAirObject.cpp	8 May 2005 23:28:59 -0000	1.23
***************
*** 65,68 ****
--- 65,70 ----
      tcPlatformObject::operator<<(stream);
  
+ 	stream >> fuel_kg;
+ 
      stream >> maxPitch_rad;
  
***************
*** 74,77 ****
--- 76,81 ----
      tcPlatformObject::operator>>(stream);
  
+ 	stream << fuel_kg;
+ 
      stream << maxPitch_rad;
  

Index: Game.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/sim/Game.cpp,v
retrieving revision 1.130
retrieving revision 1.131
diff -C2 -d -r1.130 -r1.131
*** Game.cpp	6 May 2005 23:57:51 -0000	1.130
--- Game.cpp	8 May 2005 23:28:59 -0000	1.131
***************
*** 1725,1729 ****
  		if (isLagging)
  		{
! 			dateTimeString += "[LAG]";
  		}
  
--- 1725,1729 ----
  		if (isLagging)
  		{
! 			dateTimeString += "L";
  		}