From 730e5dde39333cb2f63c72a7d7152bee5c4dbb05 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sat, 8 Feb 2014 15:09:25 -0800
Subject: Implement AString

---
 src/map/battle.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/map/battle.cpp')

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:
-- 
cgit v1.2.3-70-g09d2