diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-15 17:51:29 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2013-11-15 17:51:29 -0800 |
| commit | f906959a09d58c85d87b445fd1791d91bf278bfa (patch) | |
| tree | b65282b2c731d4eb2157ae719828cddf6b086943 /src/map/itemdb.cpp | |
| parent | 1fb7ce5a604db78c4d02f719053827269705ce13 (diff) | |
| download | tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.gz tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.bz2 tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.xz tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.zip | |
Use new IO classes
Diffstat (limited to 'src/map/itemdb.cpp')
| -rw-r--r-- | src/map/itemdb.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/map/itemdb.cpp b/src/map/itemdb.cpp index a8d8b55..5a11aa1 100644 --- a/src/map/itemdb.cpp +++ b/src/map/itemdb.cpp @@ -3,16 +3,15 @@ #include <cstdlib> #include <cstring> -#include <fstream> - #include "../strings/fstring.hpp" #include "../strings/zstring.hpp" #include "../strings/xstring.hpp" +#include "../io/read.hpp" + #include "../common/cxxstdio.hpp" #include "../common/db.hpp" #include "../common/extract.hpp" -#include "../common/io.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/socket.hpp" @@ -157,10 +156,10 @@ static int itemdb_readdb(void) { int ln = 0, lines = 0; - const char *filename = "db/item_db.txt"; + ZString filename = "db/item_db.txt"; { - std::ifstream in(filename); + io::ReadFile in(filename); if (!in.is_open()) { @@ -171,7 +170,7 @@ int itemdb_readdb(void) lines = 0; FString line; - while (io::getline(in, line)) + while (in.getline(line)) { lines++; if (!line) |