summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2013-08-20 11:29:46 -0700
committerBen Longbons <b.r.longbons@gmail.com>2013-08-20 11:33:24 -0700
commit1e8bb50b1a7883529441b9e93d78dbd9f5a5eb16 (patch)
treec374a2e3aca156566a7e5b202728987eeba9252a
parent4c40393accafdaabebd34e0cec3feae109f23443 (diff)
downloadtmwa-1e8bb50b1a7883529441b9e93d78dbd9f5a5eb16.tar.gz
tmwa-1e8bb50b1a7883529441b9e93d78dbd9f5a5eb16.tar.bz2
tmwa-1e8bb50b1a7883529441b9e93d78dbd9f5a5eb16.tar.xz
tmwa-1e8bb50b1a7883529441b9e93d78dbd9f5a5eb16.zip
Add some braces to appease certain gcc versions
-rw-r--r--src/map/atcommand.cpp12
-rw-r--r--src/map/npc.cpp8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp
index 05e49c0..302b443 100644
--- a/src/map/atcommand.cpp
+++ b/src/map/atcommand.cpp
@@ -5574,12 +5574,12 @@ size_t magic_skills_nr = sizeof(magic_skills) / sizeof(magic_skills[0]);
static
ZString magic_skill_names[magic_skills_nr] =
{
- "magic",
- "life",
- "war",
- "transmute",
- "nature",
- "astral"
+ {"magic"},
+ {"life"},
+ {"war"},
+ {"transmute"},
+ {"nature"},
+ {"astral"},
};
int atcommand_magic_info(const int fd, dumb_ptr<map_session_data>,
diff --git a/src/map/npc.cpp b/src/map/npc.cpp
index 235348f..fa2603d 100644
--- a/src/map/npc.cpp
+++ b/src/map/npc.cpp
@@ -930,10 +930,10 @@ void register_npc_name(dumb_ptr<npc_data> nd)
{
ZString types[4] =
{
- "WARP",
- "SHOP",
- "SCRIPT",
- "MESSAGE",
+ {"WARP"},
+ {"SHOP"},
+ {"SCRIPT"},
+ {"MESSAGE"},
};
if (!nd->name)
{