From f906959a09d58c85d87b445fd1791d91bf278bfa Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 15 Nov 2013 17:51:29 -0800 Subject: Use new IO classes --- src/map/skill.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/map/skill.cpp') diff --git a/src/map/skill.cpp b/src/map/skill.cpp index ab5f55b..9187335 100644 --- a/src/map/skill.cpp +++ b/src/map/skill.cpp @@ -5,15 +5,14 @@ #include #include -#include - #include "../strings/mstring.hpp" #include "../strings/fstring.hpp" #include "../strings/xstring.hpp" +#include "../io/read.hpp" + #include "../common/cxxstdio.hpp" #include "../common/extract.hpp" -#include "../common/io.hpp" #include "../common/nullpo.hpp" #include "../common/random.hpp" #include "../common/socket.hpp" @@ -1186,15 +1185,15 @@ int skill_readdb(void) for (skill_db_& skdb : skill_db) skdb = skill_db_{}; - std::ifstream in("db/skill_db.txt"); - if (!in) + io::ReadFile in("db/skill_db.txt"); + if (!in.is_open()) { PRINTF("can't read db/skill_db.txt\n"); return 1; } FString line_; - while (io::getline(in, line_)) + while (in.getline(line_)) { XString comment = "//"; XString line = line_.xislice_h(std::search(line_.begin(), line_.end(), comment.begin(), comment.end())).rstrip(); -- cgit v1.2.3-70-g09d2