From: curt <curt>
Date: Fri, 26 Jul 2002 16:54:40 +0000 (+0000)
Subject: Fixed some signed vs. unsigned warnings.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8c7fe4c328921a370e99be581922d390742c23e6;p=flightgear.git

Fixed some signed vs. unsigned warnings.
---

diff --git a/src/Objects/newmat.cxx b/src/Objects/newmat.cxx
index 28f146ffe..c7edb5fce 100644
--- a/src/Objects/newmat.cxx
+++ b/src/Objects/newmat.cxx
@@ -110,7 +110,7 @@ FGNewMat::Object::Object (const SGPropertyNode * node, double range_m)
 
 				// Note all the model paths
   vector <SGPropertyNode_ptr> path_nodes = node->getChildren("path");
-  for (int i = 0; i < path_nodes.size(); i++)
+  for (unsigned int i = 0; i < path_nodes.size(); i++)
     _paths.push_back(path_nodes[i]->getStringValue());
 
 				// Note the heading type
@@ -126,11 +126,14 @@ FGNewMat::Object::Object (const SGPropertyNode * node, double range_m)
     SG_LOG(SG_INPUT, SG_ALERT, "Unknown heading type: " << hdg
 	   << "; using 'fixed' instead.");
   }
+
+  // uncomment to preload models
+  // load_models();
 }
 
 FGNewMat::Object::~Object ()
 {
-  for (int i = 0; i < _models.size(); i++) {
+  for (unsigned int i = 0; i < _models.size(); i++) {
     if (_models[i] != 0) {
       _models[i]->deRef();
       _models[i] = 0;
@@ -147,13 +150,16 @@ FGNewMat::Object::get_model_count () const
 inline void
 FGNewMat::Object::load_models () const
 {
+  cout << "loading ground cover objects:" << endl;
+
 				// Load model only on demand
   if (!_models_loaded) {
-    for (int i = 0; i < _paths.size(); i++) {
+    for (unsigned int i = 0; i < _paths.size(); i++) {
       SGPath path = globals->get_fg_root();
       path.append(_paths[i]);
       ssgTexturePath((char *)path.dir().c_str());
       ssgEntity * entity = load_object((char *)path.c_str());
+      cout << "  " << path.str() << endl;
       if (entity != 0) {
 	float ranges[] = {0, _range_m};
 	ssgRangeSelector * lod = new ssgRangeSelector;
@@ -178,14 +184,14 @@ FGNewMat::Object::load_models () const
 ssgEntity *
 FGNewMat::Object::get_model (int index) const
 {
-  load_models();
+  load_models();                // comment this out if preloading models
   return _models[index];
 }
 
 ssgEntity *
 FGNewMat::Object::get_random_model () const
 {
-  load_models();
+  load_models();                // comment this out if preloading models
   int nModels = _models.size();
   int index = int(sg_random() * nModels);
   if (index >= nModels)
@@ -228,7 +234,7 @@ FGNewMat::ObjectGroup::ObjectGroup (SGPropertyNode * node)
 
 FGNewMat::ObjectGroup::~ObjectGroup ()
 {
-  for (int i = 0; i < _objects.size(); i++) {
+  for (unsigned int i = 0; i < _objects.size(); i++) {
     delete _objects[i];
     _objects[i] = 0;
   }