netpanzer-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[netPanzer-CVS] netpanzer/src/Editor TileSet.cpp TileTemplate.cpp


From: Hankin Chick
Subject: [netPanzer-CVS] netpanzer/src/Editor TileSet.cpp TileTemplate.cpp
Date: Sun, 23 Nov 2003 21:39:35 -0500

CVSROOT:        /cvsroot/netpanzer
Module name:    netpanzer
Branch:         
Changes by:     Hankin Chick <address@hidden>   03/11/23 21:39:34

Modified files:
        src/Editor     : TileSet.cpp TileTemplate.cpp 

Log message:
        My compiler didn't auto convert the configstring to cstring

Patches:
Index: netpanzer/src/Editor/TileSet.cpp
diff -u netpanzer/src/Editor/TileSet.cpp:1.6 
netpanzer/src/Editor/TileSet.cpp:1.7
--- netpanzer/src/Editor/TileSet.cpp:1.6        Sat Nov 22 17:50:44 2003
+++ netpanzer/src/Editor/TileSet.cpp    Sun Nov 23 21:39:34 2003
@@ -101,7 +101,7 @@
     std::string filename = dir;
     filename += "/tiles.dat";
     
-    std::auto_ptr<ReadFile> file (FileSystem::openRead(filename));
+    std::auto_ptr<ReadFile> file (FileSystem::openRead(filename.c_str()));
    
     // read the header
     std::auto_ptr<TileSetHeader> fileheader (new TileSetHeader(*file));
@@ -141,7 +141,7 @@
     std::string templatedir = dir;
     templatedir += "/templates/";
     
-    char** files = FileSystem::enumerateFiles(templatedir);
+    char** files = FileSystem::enumerateFiles(templatedir.c_str());
     for(char** file = files; *file != 0; file++) {
         std::string filename = templatedir;
         filename += *file;
@@ -157,7 +157,7 @@
     std::string filename = dir;
     filename += "/tiles.dat";
 
-    std::auto_ptr<WriteFile> file (FileSystem::openWrite(filename));
+    std::auto_ptr<WriteFile> file (FileSystem::openWrite(filename.c_str()));
     
     header->write(*file);
     if(tilesize * header->tilecount != 0)
Index: netpanzer/src/Editor/TileTemplate.cpp
diff -u netpanzer/src/Editor/TileTemplate.cpp:1.2 
netpanzer/src/Editor/TileTemplate.cpp:1.3
--- netpanzer/src/Editor/TileTemplate.cpp:1.2   Sat Nov 22 17:50:44 2003
+++ netpanzer/src/Editor/TileTemplate.cpp       Sun Nov 23 21:39:34 2003
@@ -26,7 +26,7 @@
     filename += "/";
     filename += name;
     
-    std::auto_ptr<ReadFile> file (FileSystem::openRead(filename));
+    std::auto_ptr<ReadFile> file (FileSystem::openRead(filename.c_str()));
 
     try {
         sizex = file->readULE32();
@@ -49,7 +49,7 @@
     filename += "/";
     filename += name;
     
-    std::auto_ptr<WriteFile> file(FileSystem::openWrite(filename));
+    std::auto_ptr<WriteFile> file(FileSystem::openWrite(filename.c_str()));
 
     try {
         file->writeULE32(sizex);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]