diff options
| author | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 15:09:25 -0800 |
|---|---|---|
| committer | Ben Longbons <b.r.longbons@gmail.com> | 2014-02-08 16:18:22 -0800 |
| commit | 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 (patch) | |
| tree | 510ef3e0ad46ecf1f2bee1fa42f26e6377b51686 /src/map/battle.cpp | |
| parent | 7a15a3efe85837d52d950cc9f895eadcc9eb6be1 (diff) | |
| download | tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.gz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.bz2 tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.tar.xz tmwa-730e5dde39333cb2f63c72a7d7152bee5c4dbb05.zip | |
Implement AString
Diffstat (limited to 'src/map/battle.cpp')
| -rw-r--r-- | src/map/battle.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/map/battle.cpp b/src/map/battle.cpp index 35cef79..d1e79ef 100644 --- a/src/map/battle.cpp +++ b/src/map/battle.cpp @@ -2,7 +2,7 @@ #include <cstring> -#include "../strings/fstring.hpp" +#include "../strings/astring.hpp" #include "../strings/zstring.hpp" #include "../io/cxxstdio.hpp" @@ -2420,7 +2420,7 @@ bool battle_config_read(ZString cfgName) return false; } - FString line; + AString line; while (in.getline(line)) { #define BATTLE_CONFIG_VAR(name) {{#name}, &battle_config.name} @@ -2555,7 +2555,7 @@ bool battle_config_read(ZString cfgName) goto continue_outer; } - PRINTF("WARNING: unknown battle conf key: %s\n", FString(w1)); + PRINTF("WARNING: unknown battle conf key: %s\n", AString(w1)); rv = false; continue_outer: |