summaryrefslogtreecommitdiff
path: root/src/map/mob.cpp
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-11-15 17:51:29 -0800
committerBen Longbons <b.r.longbons@gmail.com>2013-11-15 17:51:29 -0800
commitf906959a09d58c85d87b445fd1791d91bf278bfa (patch)
treeb65282b2c731d4eb2157ae719828cddf6b086943 /src/map/mob.cpp
parent1fb7ce5a604db78c4d02f719053827269705ce13 (diff)
downloadtmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.gz
tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.bz2
tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.tar.xz
tmwa-f906959a09d58c85d87b445fd1791d91bf278bfa.zip
Use new IO classes
Diffstat (limited to 'src/map/mob.cpp')
-rw-r--r--src/map/mob.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/map/mob.cpp b/src/map/mob.cpp
index 1885fbd..34374a7 100644
--- a/src/map/mob.cpp
+++ b/src/map/mob.cpp
@@ -7,14 +7,14 @@
#include <cstring>
#include <algorithm>
-#include <fstream>
#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"
@@ -3415,19 +3415,19 @@ bool extract(XString str, LevelElement *le)
static
int mob_readdb(void)
{
- const char *filename = "db/mob_db.txt";
+ ZString filename = "db/mob_db.txt";
for (mob_db_& e : mob_db)
e = mob_db_{};
{
- std::ifstream in(filename);
+ io::ReadFile in(filename);
if (!in.is_open())
{
return -1;
}
FString line;
- while (io::getline(in, line))
+ while (in.getline(line))
{
int mob_class;
@@ -3632,17 +3632,17 @@ bool extract<MobSkillTarget, void, void>(XString str, MobSkillTarget *mst)
static
int mob_readskilldb(void)
{
- const char *filename = "db/mob_skill_db.txt";
+ ZString filename = "db/mob_skill_db.txt";
{
- std::ifstream in(filename);
+ io::ReadFile in(filename);
if (!in.is_open())
{
PRINTF("can't read %s\n", filename);
return 0;
}
FString line;
- while (io::getline(in, line))
+ while (in.getline(line))
{
int mob_id;