CVS: bzflag/src/bzflag SaveWorldMenu.cxx,1.2,1.3 ServerStartMenu.cxx,1.7,1.8 ServerStartMenu.h,1.2,1.3 World.cxx,1.86,1.87

[Dave R. <tr...@us...>]

Update of /cvsroot/bzflag/bzflag/src/bzflag
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4682/src/bzflag

Modified Files:
	SaveWorldMenu.cxx ServerStartMenu.cxx ServerStartMenu.h 
	World.cxx 
Log Message:
use FileManager to open the world files to be saved, it'll make the directories

Index: SaveWorldMenu.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/SaveWorldMenu.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -w -u -r1.2 -r1.3
--- SaveWorldMenu.cxx	29 Jun 2004 05:38:52 -0000	1.2
+++ SaveWorldMenu.cxx	29 Jun 2004 06:41:22 -0000	1.3
@@ -90,7 +90,9 @@
       newLabel += fullname;
       status->setString( newLabel );
     } else {
-      status->setString( "Error saving file" );
+      std::string newLabel = "Error Saving: ";
+      newLabel += fullname;
+      status->setString(newLabel);
     }
   }
   const OpenGLTexFont& font = status->getFont();

Index: ServerStartMenu.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/ServerStartMenu.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -w -u -r1.7 -r1.8
--- ServerStartMenu.cxx	29 Jun 2004 05:38:52 -0000	1.7
+++ ServerStartMenu.cxx	29 Jun 2004 06:41:22 -0000	1.8
@@ -260,7 +260,7 @@
 {
 }
 
-void ServerStartMenu::scanWorldFiles (std::string& searchDir,
+void ServerStartMenu::scanWorldFiles (const std::string& searchDir,
                                       std::vector<std::string>* items)
 {
 #ifdef _WIN32

Index: ServerStartMenu.h
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/ServerStartMenu.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -w -u -r1.2 -r1.3
--- ServerStartMenu.h	29 Jun 2004 05:38:52 -0000	1.2
+++ ServerStartMenu.h	29 Jun 2004 06:41:22 -0000	1.3
@@ -41,7 +41,8 @@
   HUDuiLabel* createLabel(const char*);
   void setStatus(const char*, const std::vector<std::string> *parms = NULL);
   void loadSettings();
-  void scanWorldFiles (std::string& searchDir, std::vector<std::string>* items);
+  void scanWorldFiles (const std::string& searchDir, 
+                       std::vector<std::string>* items);
 
 private:
   float center;

Index: World.cxx
===================================================================
RCS file: /cvsroot/bzflag/bzflag/src/bzflag/World.cxx,v
retrieving revision 1.86
retrieving revision 1.87
diff -w -u -r1.86 -r1.87
--- World.cxx	23 Jun 2004 08:08:32 -0000	1.86
+++ World.cxx	29 Jun 2004 06:41:22 -0000	1.87
@@ -21,6 +21,7 @@
 #include "StateDatabase.h"
 #include "BZDBCache.h"
 #include "TextureManager.h"
+#include "FileManager.h"
 
 
 //
@@ -635,10 +636,13 @@
 
 bool			World::writeWorld(std::string filename)
 {
-  std::ofstream out(filename.c_str());
-  if (!out)
+  std::ostream *stream = FILEMGR.createDataOutStream(filename.c_str());
+  if (stream == NULL)
     return false;
     
+  // for notational convenience    
+  std::ostream& out = *stream;
+  
   time_t nowTime = time (NULL);
   out << "# BZFlag client: saved world on " << ctime(&nowTime) << std::endl;
 
@@ -874,7 +878,7 @@
     }
   }
 
-  out.close();
+  delete stream;
 
   return true;
 }