From 1a651243bb2c8e18baa9aac30ac52a62185074e7 Mon Sep 17 00:00:00 2001
From: Ben Longbons <b.r.longbons@gmail.com>
Date: Sun, 30 Mar 2014 23:14:12 -0700
Subject: Be stricter about most arrays

---
 src/map/mapflag.cpp | 64 ++++++++++++++++++++++++++---------------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

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

diff --git a/src/map/mapflag.cpp b/src/map/mapflag.cpp
index 097f4d1..51af30a 100644
--- a/src/map/mapflag.cpp
+++ b/src/map/mapflag.cpp
@@ -40,41 +40,41 @@ bool extract<MapFlag, void, void>(XString str, MapFlag *mf)
 {
     const struct
     {
-        char str[32];
+        ZString str;
         MapFlag id;
     } flags[] =
     {
-        //{"alias", MapFlag::ALIAS},
-        //{"nomemo", MapFlag::NOMEMO},
-        {"noteleport", MapFlag::NOTELEPORT},
-        {"noreturn", MapFlag::NORETURN},
-        {"monster_noteleport", MapFlag::MONSTER_NOTELEPORT},
-        {"nosave", MapFlag::NOSAVE},
-        //{"nobranch", MapFlag::NOBRANCH},
-        {"nopenalty", MapFlag::NOPENALTY},
-        {"pvp", MapFlag::PVP},
-        {"pvp_noparty", MapFlag::PVP_NOPARTY},
-        //{"pvp_noguild", MapFlag::PVP_NOGUILD},
-        //{"pvp_nightmaredrop", MapFlag::PVP_NIGHTMAREDROP},
-        {"pvp_nocalcrank", MapFlag::PVP_NOCALCRANK},
-        //{"gvg", MapFlag::GVG},
-        //{"gvg_noparty", MapFlag::GVG_NOPARTY},
-        //{"nozenypenalty", MapFlag::NOZENYPENALTY},
-        //{"notrade", MapFlag::NOTRADE},
-        //{"noskill", MapFlag::NOSKILL},
-        {"nowarp", MapFlag::NOWARP},
-        {"nowarpto", MapFlag::NOWARPTO},
-        {"nopvp", MapFlag::NOPVP},
-        //{"noicewall", MapFlag::NOICEWALL},
-        {"snow", MapFlag::SNOW},
-        {"fog", MapFlag::FOG},
-        {"sakura", MapFlag::SAKURA},
-        {"leaves", MapFlag::LEAVES},
-        {"rain", MapFlag::RAIN},
-        {"no_player_drops", MapFlag::NO_PLAYER_DROPS},
-        {"town", MapFlag::TOWN},
-        {"outside", MapFlag::OUTSIDE},
-        {"resave", MapFlag::RESAVE},
+        //{ZString("alias"), MapFlag::ALIAS},
+        //{ZString("nomemo"), MapFlag::NOMEMO},
+        {ZString("noteleport"), MapFlag::NOTELEPORT},
+        {ZString("noreturn"), MapFlag::NORETURN},
+        {ZString("monster_noteleport"), MapFlag::MONSTER_NOTELEPORT},
+        {ZString("nosave"), MapFlag::NOSAVE},
+        //{ZString("nobranch"), MapFlag::NOBRANCH},
+        {ZString("nopenalty"), MapFlag::NOPENALTY},
+        {ZString("pvp"), MapFlag::PVP},
+        {ZString("pvp_noparty"), MapFlag::PVP_NOPARTY},
+        //{ZString("pvp_noguild"), MapFlag::PVP_NOGUILD},
+        //{ZString("pvp_nightmaredrop"), MapFlag::PVP_NIGHTMAREDROP},
+        {ZString("pvp_nocalcrank"), MapFlag::PVP_NOCALCRANK},
+        //{ZString("gvg"), MapFlag::GVG},
+        //{ZString("gvg_noparty"), MapFlag::GVG_NOPARTY},
+        //{ZString("nozenypenalty"), MapFlag::NOZENYPENALTY},
+        //{ZString("notrade"), MapFlag::NOTRADE},
+        //{ZString("noskill"), MapFlag::NOSKILL},
+        {ZString("nowarp"), MapFlag::NOWARP},
+        {ZString("nowarpto"), MapFlag::NOWARPTO},
+        {ZString("nopvp"), MapFlag::NOPVP},
+        //{ZString("noicewall"), MapFlag::NOICEWALL},
+        {ZString("snow"), MapFlag::SNOW},
+        {ZString("fog"), MapFlag::FOG},
+        {ZString("sakura"), MapFlag::SAKURA},
+        {ZString("leaves"), MapFlag::LEAVES},
+        {ZString("rain"), MapFlag::RAIN},
+        {ZString("no_player_drops"), MapFlag::NO_PLAYER_DROPS},
+        {ZString("town"), MapFlag::TOWN},
+        {ZString("outside"), MapFlag::OUTSIDE},
+        {ZString("resave"), MapFlag::RESAVE},
     };
     for (auto& pair : flags)
         if (str == pair.str)
-- 
cgit v1.2.3-70-g09d2