fly/flightgear
1
0
Fork 0
Code Activity

Merge commit 'refs/merge-requests/6' of git@gitorious.org:fg/flightgear into next

Browse source
This commit is contained in:
Csaba Halasz 2010-08-31 22:39:34 +02:00
commit d8165470c3
2 changed files with 1553 additions and 1547 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/AIModel/AIMultiplayer.cxx
View file

@ -70,7 +70,7 @@ void FGAIMultiplayer::bind() {
FGAIBase::bind();
props->tie("refuel/contact", SGRawValuePointer<bool>(&contact));
props->setBoolValue("tanker",isTanker);
props->tie("tanker", SGRawValuePointer<bool>(&isTanker));
props->tie("controls/invisible",
SGRawValuePointer<bool>(&invisible));
@ -460,16 +460,20 @@ void FGAIMultiplayer::update(double dt)
if ( isTanker) {
//cout << "IS tanker ";
if ( (range_ft2 < 250.0 * 250.0) &&
(y_shift > 0.0) &&
(elevation > 0.0) ){
// refuel_node->setBoolValue(true);
//cout << "in contact" << endl;
contact = true;
} else {
// refuel_node->setBoolValue(false);
//cout << "not in contact" << endl;
contact = false;
}
} else {
//cout << "NOT tanker " << endl;
contact = false;
}

2
src/MultiPlayer/multiplaymgr.cxx
View file

@ -160,6 +160,8 @@ FGMultiplayMgr::sIdPropertyList[] = {
{1200, "environment/wildfire/data", simgear::props::STRING},
{1300, "tanker", simgear::props::INT},
{10001, "sim/multiplay/transmission-freq-hz", simgear::props::STRING},
{10002, "sim/multiplay/chat", simgear::props::STRING},