From 56e669281780e577235029097f34e006efec82ee Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Fri, 6 Apr 2018 03:30:44 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A7=80=EB=8F=84=EC=97=90=20=ED=95=84?=
 =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20?=
 =?UTF-8?q?=EC=96=BB=EC=96=B4=EC=98=A4=EB=8A=94=20=EA=B3=BC=EC=A0=95?=
 =?UTF-8?q?=EC=9D=98=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/func_map.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hwe/func_map.php b/hwe/func_map.php
index 575014c9..c6703707 100644
--- a/hwe/func_map.php
+++ b/hwe/func_map.php
@@ -50,7 +50,8 @@ function getWorldMap($req){
         return getHistoryMap($req->year, $req->month);
     }
 
-    $generalID = Session::Instance()->generalID;
+    $session = Session::Instance();
+    $generalID = $session->generalID;
 
     $db = DB::db();
 
@@ -59,7 +60,7 @@ function getWorldMap($req){
     $year = Util::toInt($game['year']);
     $month = Util::toInt($game['month']);
 
-    if($generalID && ($req->showMe || $req->neutralView)){
+    if($generalID && ($req->showMe || !$req->neutralView)){
         $city = $db->queryFirstRow(
                 'select `city`, `nation` from `general` where `no`=%i',
                  $generalID);
@@ -70,7 +71,7 @@ function getWorldMap($req){
         if(!$req->showMe){
             $myCity = null;
         }
-        if(!$req->neutralView){
+        if($req->neutralView){
             $myNation = null;
         }
     }