gcblue-commits

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

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

Modified Files:
	tcPlatformInterface.cpp tcPlatformInterfaceExtensionB.cpp 
	tcScenarioInterface.cpp tcSimPythonInterface.cpp 
Log Message:


Index: tcPlatformInterfaceExtensionB.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterfaceExtensionB.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** tcPlatformInterfaceExtensionB.cpp	29 Mar 2005 00:12:27 -0000	1.22
--- tcPlatformInterfaceExtensionB.cpp	29 Apr 2005 18:52:54 -0000	1.23
***************
*** 142,145 ****
--- 142,151 ----
              .def("SendCommand",&tcPlatformInterface::SendCommand)
  
+ 			// multiplayer related
+ 			.def("GetController", &tcPlatformInterface::GetController)
+ 			.def("IsAvailable", &tcPlatformInterface::IsAvailable)
+ 			.def("IsMultiplayerActive", &tcPlatformInterface::IsMultiplayerActive)
+ 			.def("TakeControl", &tcPlatformInterface::TakeControl)
+ 			
              // miscellaneous
              .def("GetTime", &tcPlatformInterface::GetTime)

Index: tcSimPythonInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcSimPythonInterface.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** tcSimPythonInterface.cpp	31 Mar 2005 03:51:13 -0000	1.28
--- tcSimPythonInterface.cpp	29 Apr 2005 18:52:54 -0000	1.29
***************
*** 353,357 ****
  
      if ((mpHookedObj != NULL) && 
! 		(mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->mnAlliance)))
      {
          strcpy(str,"HookedUnitInfo");
--- 353,357 ----
  
      if ((mpHookedObj != NULL) && 
! 		(mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->GetAlliance())))
      {
          strcpy(str,"HookedUnitInfo");
***************
*** 363,366 ****
--- 363,373 ----
  }
  
+ tcScenarioInterface* tcSimPythonInterface::GetScenarioInterface() const
+ {
+     wxASSERT(scenarioInterface);
+     
+     return scenarioInterface;
+ }
+ 
  /**
  * Loads scenario from Python script file. File should have
***************
*** 594,598 ****
      char zBuff[128];
      if (mpHookedObj == NULL) return;
!     if (!mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->mnAlliance)) return;
  
      sprintf(zBuff,"Menu.ProcessHotKey(HookedUnitInfo,'%c')\n",key);
--- 601,605 ----
      char zBuff[128];
      if (mpHookedObj == NULL) return;
!     if (!mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->GetAlliance())) return;
  
      sprintf(zBuff,"Menu.ProcessHotKey(HookedUnitInfo,'%c')\n",key);
***************
*** 611,615 ****
  	char zBuff[128];
  	if (mpHookedObj == NULL) return;
! 	if (!mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->mnAlliance)) return;
  
  	sprintf(zBuff,"Menu.ProcessSecondaryHook(HookedUnitInfo,%d)\n",id);
--- 618,622 ----
  	char zBuff[128];
  	if (mpHookedObj == NULL) return;
! 	if (!mpSimState->mpUserInfo->IsOwnAlliance(mpHookedObj->GetAlliance())) return;
  
  	sprintf(zBuff,"Menu.ProcessSecondaryHook(HookedUnitInfo,%d)\n",id);
***************
*** 655,659 ****
  		tcGameObject* gameObj = mpSimState->GetObject(unitIds[idx]);
  		if ((!gameObj) || 
! 			(!mpSimState->mpUserInfo->IsOwnAlliance(gameObj->mnAlliance)))
  		{
  			fprintf(stderr, "tcSimPythonInterface::SetMenuGroup - null or "
--- 662,666 ----
  		tcGameObject* gameObj = mpSimState->GetObject(unitIds[idx]);
  		if ((!gameObj) || 
! 			(!mpSimState->mpUserInfo->IsOwnAlliance(gameObj->GetAlliance())))
  		{
  			fprintf(stderr, "tcSimPythonInterface::SetMenuGroup - null or "
***************
*** 696,700 ****
  
      if (!pGameObj) return;
!     if (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->mnAlliance))
      {
          meMenuMode = UNIT_MENU;
--- 703,707 ----
  
      if (!pGameObj) return;
!     if (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->GetAlliance()))
      {
          meMenuMode = UNIT_MENU;
***************
*** 815,818 ****
--- 822,826 ----
      tcScenarioInterface::AddGoalClasses(mpDictionary);
      ScenarioInterface = scenarioInterfaceType();
+     scenarioInterface = extract<tcScenarioInterface*>(ScenarioInterface);
  
      ScriptedTaskInterface tempInterface;

Index: tcScenarioInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcScenarioInterface.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** tcScenarioInterface.cpp	31 Mar 2005 03:51:13 -0000	1.23
--- tcScenarioInterface.cpp	29 Apr 2005 18:52:54 -0000	1.24
***************
*** 226,230 ****
          gameObj->mcKin.mfSpeed_kts = unit.speed;
          gameObj->mfDamageLevel = 0;  
!         gameObj->mnAlliance = alliance;
          gameObj->mfStatusTime = 0; // for lack of a better time
          gameObj->mzUnit = unit.unitName.c_str();
--- 226,230 ----
          gameObj->mcKin.mfSpeed_kts = unit.speed;
          gameObj->mfDamageLevel = 0;  
!         gameObj->SetAlliance(alliance);
          gameObj->mfStatusTime = 0; // for lack of a better time
          gameObj->mzUnit = unit.unitName.c_str();
***************
*** 301,305 ****
                  return false;
              }
!             return flightOps->AddChildToFlightDeck(className, unitName, loc);
          }
          else
--- 301,305 ----
                  return false;
              }
!             return flightOps->AddChildToFlightDeck(className, unitName, loc, 0);
          }
          else

Index: tcPlatformInterface.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterface.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** tcPlatformInterface.cpp	17 Apr 2005 22:35:31 -0000	1.42
--- tcPlatformInterface.cpp	29 Apr 2005 18:52:54 -0000	1.43
***************
*** 48,51 ****
--- 48,52 ----
  #include "tcLauncher.h"
  #include "tcMessageInterface.h"
+ #include "network/tcMultiplayerInterface.h"
  #include "tcStores.h"
  #include "ai/Brain.h"
***************
*** 272,276 ****
          ** On client machine, only own-alliance objects exist in sim state
          */
!         if (pGameObj && (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->mnAlliance)))
          {
              tcKinematics *pTargetKin = &pGameObj->mcKin;
--- 273,277 ----
          ** On client machine, only own-alliance objects exist in sim state
          */
!         if (pGameObj && (mpSimState->mpUserInfo->IsOwnAlliance(pGameObj->GetAlliance())))
          {
              tcKinematics *pTargetKin = &pGameObj->mcKin;
***************
*** 296,300 ****
          {
              tcSensorMapTrack *smtrack = 
!                 mpSimState->mcSensorMap.GetSensorMapTrack(GetTarget(), mpPlatformObj->mnAlliance);
              if (smtrack)
              {
--- 297,301 ----
          {
              tcSensorMapTrack *smtrack = 
!                 mpSimState->mcSensorMap.GetSensorMapTrack(GetTarget(), mpPlatformObj->GetAlliance());
              if (smtrack)
              {
***************
*** 806,810 ****
          if (mpPlatformObj)
          {
!             unsigned int nAlliance = mpPlatformObj->mnAlliance;
              mpSensorMap = mpSimState->mcSensorMap.GetMap(nAlliance);
              wxASSERT(mpSensorMap);
--- 807,811 ----
          if (mpPlatformObj)
          {
!             unsigned int nAlliance = mpPlatformObj->GetAlliance();
              mpSensorMap = mpSimState->mcSensorMap.GetMap(nAlliance);
              wxASSERT(mpSensorMap);
***************
*** 998,1002 ****
          tcSensorMapTrack track;
  
!         bool found = mpSimState->GetTrack(id, mpPlatformObj->mnAlliance, track);
  
          return track;
--- 999,1003 ----
          tcSensorMapTrack track;
  
!         bool found = mpSimState->GetTrack(id, mpPlatformObj->GetAlliance(), track);
  
          return track;
***************
*** 1069,1072 ****
--- 1070,1099 ----
  
  
+ 	std::string tcPlatformInterface::GetController() const
+ 	{
+ 		return std::string(mpPlatformObj->GetController());
+ 	}
+ 
+ 	bool tcPlatformInterface::IsAvailable() const
+ 	{
+ 		return mpPlatformObj->IsAvailable();
+ 	}
+ 
+ 	bool tcPlatformInterface::IsMultiplayerActive() const
+ 	{
+ 		return mpSimState->IsMultiplayerActive();
+ 	}
+ 
+ 	void tcPlatformInterface::TakeControl()
+ 	{
+ 		using network::tcMultiplayerInterface;
+ 		if (mpPlatformObj->IsAvailable())
+ 		{
+ 			tcMultiplayerInterface::Get()->SendControlRequest(mpPlatformObj->mnID);
+ 		}
+ 	}
+ 
+ 
+ 
      double tcPlatformInterface::GetTime() const
      {
***************
*** 1088,1092 ****
      bool tcPlatformInterface::IsPlayerControlled() const
      {
!         return mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->mnAlliance);
      }
  
--- 1115,1127 ----
      bool tcPlatformInterface::IsPlayerControlled() const
      {
! 		// single player or server, check for alliance match only
! 		if (!mpPlatformObj->IsClientMode())
! 		{
! 			return mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->GetAlliance());
! 		}
! 		else
! 		{
! 			return mpPlatformObj->IsControlled();
! 		}
      }
  
***************
*** 1094,1098 ****
      {
          tcGameObject* obj = mpSimState->GetObjectByName(unitName);
!         bool isOwnAlliance = mpPlatformObj->mnAlliance == obj->mnAlliance;
  
          if ((obj == 0) || !isOwnAlliance)
--- 1129,1133 ----
      {
          tcGameObject* obj = mpSimState->GetObjectByName(unitName);
!         bool isOwnAlliance = mpPlatformObj->GetAlliance() == obj->GetAlliance();
  
          if ((obj == 0) || !isOwnAlliance)
***************
*** 1109,1113 ****
      {
          tcGameObject* obj = mpSimState->GetObject(id);
!         if ((obj == 0) || !mpSimState->mpUserInfo->IsOwnAlliance(obj->mnAlliance))
  		{
  			return std::string("");
--- 1144,1148 ----
      {
          tcGameObject* obj = mpSimState->GetObject(id);
!         if ((obj == 0) || !mpSimState->mpUserInfo->IsOwnAlliance(obj->GetAlliance()))
  		{
  			return std::string("");
***************
*** 1213,1217 ****
  	{
          tcGameObject* obj = mpSimState->GetObject(id);
!         if ((obj == 0) || !mpSimState->mpUserInfo->IsOwnAlliance(obj->mnAlliance))
  		{
  			tcTrack data;
--- 1248,1252 ----
  	{
          tcGameObject* obj = mpSimState->GetObject(id);
!         if ((obj == 0) || !mpSimState->mpUserInfo->IsOwnAlliance(obj->GetAlliance()))
  		{
  			tcTrack data;
***************
*** 1251,1255 ****
          GetSensorMap();
          isPlatformOwnAlliance = (mpPlatformObj) ?
!             (mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->mnAlliance) != 0) : false;
      }
  
--- 1286,1290 ----
          GetSensorMap();
          isPlatformOwnAlliance = (mpPlatformObj) ?
!             (mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->GetAlliance()) != 0) : false;
      }
  
***************
*** 1264,1268 ****
          GetSensorMap();
          isPlatformOwnAlliance = (mpPlatformObj) ?
!             (mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->mnAlliance) != 0) : false;
      } 
  
--- 1299,1303 ----
          GetSensorMap();
          isPlatformOwnAlliance = (mpPlatformObj) ?
!             (mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->GetAlliance()) != 0) : false;
      } 
  
***************
*** 1287,1293 ****
  
  		isPlatformOwnAlliance = (mpPlatformObj) ?
! 			(mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->mnAlliance) != 0) : false;
  
! 		mpSensorMap = mpSimState->mcSensorMap.GetMap(mpPlatformObj->mnAlliance);
  		wxASSERT(mpSensorMap);
  	}
--- 1322,1328 ----
  
  		isPlatformOwnAlliance = (mpPlatformObj) ?
! 			(mpSimState->mpUserInfo->IsOwnAlliance(mpPlatformObj->GetAlliance()) != 0) : false;
  
! 		mpSensorMap = mpSimState->mcSensorMap.GetMap(mpPlatformObj->GetAlliance());
  		wxASSERT(mpSensorMap);
  	}