fly/flightgear
1
0
Fork 0
Code Activity

Silence a few compiler warnings

Browse source
This commit is contained in:
Erik Hofman 2017-01-26 15:37:43 +01:00
parent 5aef1a8700
commit 1a0537e493
4 changed files with 17 additions and 17 deletions

2
src/FDM/UIUCModel/uiuc_convert.cpp
View file

@ -66,7 +66,7 @@
double uiuc_convert( int conversionType ) double uiuc_convert( int conversionType )
{ {
double factor; double factor = 1;
switch(conversionType) switch(conversionType)
{ {

12
src/Input/FGEventInput.cxx
View file

@ -280,13 +280,13 @@ void FGInputDevice::update( double dt )
for( map<string,FGInputEvent_ptr>::iterator it = handledEvents.begin(); it != handledEvents.end(); it++ ) for( map<string,FGInputEvent_ptr>::iterator it = handledEvents.begin(); it != handledEvents.end(); it++ )
(*it).second->update( dt ); (*it).second->update( dt );
report_setting_list_t::const_iterator it; report_setting_list_t::const_iterator it;
for (it = reportSettings.begin(); it != reportSettings.end(); ++it) { for (it = reportSettings.begin(); it != reportSettings.end(); ++it) {
if ((*it)->Test()) { if ((*it)->Test()) {
std::string reportData = (*it)->reportBytes(nasalModule); std::string reportData = (*it)->reportBytes(nasalModule);
SendFeatureReport((*it)->getReportId(), reportData); SendFeatureReport((*it)->getReportId(), reportData);
}
} }
}
} }
void FGInputDevice::HandleEvent( FGEventData & eventData ) void FGInputDevice::HandleEvent( FGEventData & eventData )

17
src/Model/modelmgr.cxx
View file

@ -129,16 +129,15 @@ FGModelMgr::add_model (SGPropertyNode * node)
else else
model->setHeadingDeg(node->getDoubleValue("heading-deg")); model->setHeadingDeg(node->getDoubleValue("heading-deg"));
if (node->hasChild("enable-hot")) {
if (node->hasChild("enable-hot")) { osg::Node::NodeMask mask = model->getSceneGraph()->getNodeMask();
osg::Node::NodeMask mask = model->getSceneGraph()->getNodeMask(); if (node->getBoolValue("enable-hot")) {
if (node->getBoolValue("enable-hot")) { mask |= SG_NODEMASK_TERRAIN_BIT;
mask |= SG_NODEMASK_TERRAIN_BIT; } else {
} else { mask &= ~SG_NODEMASK_TERRAIN_BIT;
mask &= ~SG_NODEMASK_TERRAIN_BIT;
}
model->getSceneGraph()->setNodeMask(mask);
} }
model->getSceneGraph()->setNodeMask(mask);
}
// Add this model to the global scene graph // Add this model to the global scene graph
globals->get_scenery()->get_scene_graph()->addChild(model->getSceneGraph()); globals->get_scenery()->get_scene_graph()->addChild(model->getSceneGraph());

3
src/Scripting/NasalSys.cxx
View file

@ -1220,7 +1220,8 @@ bool FGNasalSys::createModule(const char* moduleName, const char* fileName,
naStr_fromdata(modname, (char*)moduleName, strlen(moduleName)); naStr_fromdata(modname, (char*)moduleName, strlen(moduleName));
if (naIsNil(_globals)) if (naIsNil(_globals))
return false; return false;
if (!naHash_get(_globals, modname, &locals))
if (!naHash_get(_globals, modname, &locals))
locals = naNewHash(ctx); locals = naNewHash(ctx);
_cmdArg = (SGPropertyNode*)cmdarg; _cmdArg = (SGPropertyNode*)cmdarg;