From: curt <curt>
Date: Fri, 5 Jun 1998 18:19:18 +0000 (+0000)
Subject: Recognize file, file.gz, and file.obj as scenery object files.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=22dd9999a8bfbbe0d1dc4fdcb8d0b0fbde89c9d7;p=flightgear.git

Recognize file, file.gz, and file.obj as scenery object files.
---

diff --git a/Scenery/obj.cxx b/Scenery/obj.cxx
index 05671b410..fab7777f5 100644
--- a/Scenery/obj.cxx
+++ b/Scenery/obj.cxx
@@ -109,19 +109,17 @@ int fgObjLoad(char *path, fgTILE *tile) {
 
     o = &current_options;
 
-    // First try "path.obz" (compressed format)
+    // First try "path.gz" (compressed format)
     strcpy(fgpath, path);
-    strcat(fgpath, ".obz");
+    strcat(fgpath, ".gz");
     if ( (f = fgopen(fgpath, "rb")) == NULL ) {
-	// Next try "path.obj" (uncompressed format)
+	// Next try "path" (uncompressed format)
 	strcpy(fgpath, path);
-	strcat(fgpath, ".obj");
 	if ( (f = fgopen(fgpath, "rb")) == NULL ) {
-	    // Next try "path.obj.gz" (compressed format)
+	    // Next try "path.obj" (uncompressed format)
 	    strcat(fgpath, ".gz");
 	    if ( (f = fgopen(fgpath, "rb")) == NULL ) {
 		strcpy(fgpath, path);
-		strcat(fgpath, ".obj");
 		fgPrintf( FG_TERRAIN, FG_ALERT, 
 			  "Cannot open file: %s\n", fgpath );
 		return(0);
@@ -408,6 +406,9 @@ int fgObjLoad(char *path, fgTILE *tile) {
 
 
 // $Log$
+// Revision 1.8  1998/06/05 18:19:18  curt
+// Recognize file, file.gz, and file.obj as scenery object files.
+//
 // Revision 1.7  1998/05/24 02:49:09  curt
 // Implimented fragment level view frustum culling.
 //