[Gcblue-commits] gcb_wx/src/scriptinterface tcPlatformInterface.cpp,1.31,1.32 tcPlatformInterfaceExt
Status: Alpha
Brought to you by:
ddcforge
|
From: Dewitt C. <ddc...@us...> - 2004-12-07 04:01:24
|
Update of /cvsroot/gcblue/gcb_wx/src/scriptinterface In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13689/src/scriptinterface Modified Files: tcPlatformInterface.cpp tcPlatformInterfaceExtension.cpp Log Message: Sonar work, passive sonar, torpedoes Index: tcPlatformInterface.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterface.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** tcPlatformInterface.cpp 5 Dec 2004 02:49:47 -0000 1.31 --- tcPlatformInterface.cpp 7 Dec 2004 04:00:41 -0000 1.32 *************** *** 464,472 **** } const tcLauncher* pLauncherData = mpPlatformObj->mcLauncherState.GetLauncher(anLauncher); ! if (tcMissileDBObject* missileDBObj = dynamic_cast<tcMissileDBObject*>(pLauncherData->mpChildDBObj)) { info.mfRange_km = missileDBObj->mfRange_km; } else if (tcBallisticDBObject* ballisticDBObj = --- 464,475 ---- } const tcLauncher* pLauncherData = mpPlatformObj->mcLauncherState.GetLauncher(anLauncher); ! ! info.maxDepth_m = 0; ! if (tcMissileDBObject* missileDBObj = dynamic_cast<tcMissileDBObject*>(pLauncherData->mpChildDBObj)) { info.mfRange_km = missileDBObj->mfRange_km; + info.maxDepth_m = 30.0f; } else if (tcBallisticDBObject* ballisticDBObj = *************** *** 479,482 **** --- 482,486 ---- { info.mfRange_km = torpDBObj->mfRange_km; + info.maxDepth_m = torpDBObj->maxDepth_m; } else { *************** *** 554,558 **** { int launcherStatus = mpPlatformObj->SetLaunch(anLauncher, quantity); ! if (launcherStatus != tcLauncherState::LAUNCHER_READY) { DisplayMessage(tcLauncherState::TranslateLauncherStatus(launcherStatus)); --- 558,562 ---- { int launcherStatus = mpPlatformObj->SetLaunch(anLauncher, quantity); ! if (launcherStatus != tcLauncher::LAUNCHER_READY) { DisplayMessage(tcLauncherState::TranslateLauncherStatus(launcherStatus)); Index: tcPlatformInterfaceExtension.cpp =================================================================== RCS file: /cvsroot/gcblue/gcb_wx/src/scriptinterface/tcPlatformInterfaceExtension.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** tcPlatformInterfaceExtension.cpp 16 Aug 2004 01:43:31 -0000 1.11 --- tcPlatformInterfaceExtension.cpp 7 Dec 2004 04:00:41 -0000 1.12 *************** *** 119,122 **** --- 119,123 ---- .def_readonly("Range_km",&tcLauncherInfo::mfRange_km) .def_readonly("LaunchMode",&tcLauncherInfo::mnLaunchMode) // 0 - datum, 1 - handoff + .def_readonly("MaxDepth_m",&tcLauncherInfo::maxDepth_m) ; |