From 3365634a0162ac2ced211eed87c5b8e3fef4a6c9 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 14 Jan 2003 14:00:09 +0000
Subject: [PATCH] Submission from Joseph Stell, added LoadModels to
 TerrapageNode.

---
 src/osgPlugins/txp/TerrapageNode.cpp | 3 +++
 src/osgPlugins/txp/TrPageArchive.h   | 2 +-
 src/osgPlugins/txp/trpage_write.h    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/osgPlugins/txp/TerrapageNode.cpp b/src/osgPlugins/txp/TerrapageNode.cpp
index b5b2bd012..6a65c8161 100644
--- a/src/osgPlugins/txp/TerrapageNode.cpp
+++ b/src/osgPlugins/txp/TerrapageNode.cpp
@@ -61,6 +61,9 @@ bool TerrapageNode::loadDatabase()
     // Note: Should be checking the return values
     txpArchive->LoadMaterials();
 
+    // Note: Should be checking the return values
+    txpArchive->LoadModels();
+
     // get the exents of the archive
     const trpgHeader *head = txpArchive->GetHeader();
     trpg2dPoint sw,ne;
diff --git a/src/osgPlugins/txp/TrPageArchive.h b/src/osgPlugins/txp/TrPageArchive.h
index c9b6a52ee..2a24c70b5 100644
--- a/src/osgPlugins/txp/TrPageArchive.h
+++ b/src/osgPlugins/txp/TrPageArchive.h
@@ -51,7 +51,7 @@ namespace txp
         /// Load and create textures and materials
         void LoadMaterials();
 
-        // Load and create models, usualy OpenFlight models
+        /// Load and create models, usualy OpenFlight models
         bool LoadModels();
         
         /** Load a TXP tile and 
diff --git a/src/osgPlugins/txp/trpage_write.h b/src/osgPlugins/txp/trpage_write.h
index 9e3c1e9a5..8a0858788 100644
--- a/src/osgPlugins/txp/trpage_write.h
+++ b/src/osgPlugins/txp/trpage_write.h
@@ -59,7 +59,7 @@ public:
     inline void AddStripStat(int val) { stripStat[MIN(14,val)]++; totalStripTri += val; totalTri += val; numStrip++;}
     inline void AddFanStat(int val) { fanStat[MIN(14,val)]++; totalFanTri += val; totalTri += val; numFan++;}
     inline void AddBagStat(int val) { totalBagTri += val; totalTri += val;}
-    inline void AddQuadStat(int val) { totalQuad++; }
+    inline void AddQuadStat(int /*val*/) { totalQuad++; }
 };
 
 /* Geometry Helper