From 2f94539545b176a7dc2981b1a932b8428e33eaa7 Mon Sep 17 00:00:00 2001
From: gumi <git@gumi.ca>
Date: Thu, 10 Jan 2019 18:30:38 -0500
Subject: drop support for gcc-5, gcc-6, clang-4, clang-5 in travis and fix
 some misc issues

---
 src/map/map.hpp        | 8 ++++----
 src/map/script-fun.cpp | 2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/map')

diff --git a/src/map/map.hpp b/src/map/map.hpp
index 2f6ef21..60b3462 100644
--- a/src/map/map.hpp
+++ b/src/map/map.hpp
@@ -584,10 +584,10 @@ void map_log(XString line);
 #define MAP_LOG(format, ...)    \
     map_log(STRPRINTF(format, ## __VA_ARGS__))
 
-#define MAP_LOG_AND_ECHO(...) \
-    do { \
-      PRINTF(__VA_ARGS__); \
-      MAP_LOG(__VA_ARGS__); \
+#define MAP_LOG_AND_ECHO(...)   \
+    do {                        \
+      PRINTF(__VA_ARGS__);      \
+      MAP_LOG(__VA_ARGS__);     \
     } while (0)
 
 #define MAP_LOG_PC(sd, fmt, ...)    \
diff --git a/src/map/script-fun.cpp b/src/map/script-fun.cpp
index 8292bdb..ab60535 100644
--- a/src/map/script-fun.cpp
+++ b/src/map/script-fun.cpp
@@ -4150,8 +4150,10 @@ void builtin_npcareawarp(ScriptState *st)
         }
     }
     else
+    {
         x = random_::in(x0, x1);
         y = random_::in(y0, y1);
+    }
 
     npc_enable(npc, 0);
     map_delblock(nd); /* [Freeyorp] */
-- 
cgit v1.2.3-70-g09d2