From 009524edf3b4051c8484cf4d30cb063760fe487c Mon Sep 17 00:00:00 2001
From: revofpla <revofpla@naver.com>
Date: Wed, 17 Jan 2018 18:54:48 +0900
Subject: [PATCH] =?UTF-8?q?[php5=5Fdebug]=20=EC=A7=80=EB=8F=84=20=EC=B6=9C?=
 =?UTF-8?q?=EB=A0=A5=20=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20?=
 =?UTF-8?q?=EB=82=B4=20=EC=A0=95=EB=B3=B4=EC=9D=98=20array=20=ED=98=B8?=
 =?UTF-8?q?=EC=B6=9C=EC=97=90=20=EB=94=B0=EC=98=B4=ED=91=9C=20=EB=88=84?=
 =?UTF-8?q?=EB=9D=BD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 twe/func.php    | 20 ++++++++++----------
 twe/map.php     | 11 +++++++----
 twe/new_lib.php |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/twe/func.php b/twe/func.php
index b3f82b74..a29ce46c 100644
--- a/twe/func.php
+++ b/twe/func.php
@@ -2788,11 +2788,11 @@ function generalInfo2($connect, $no, $skin) {
         $dedication = unfont($dedication);
     }
 
-    $dex0  = $general[dex0]  / $_dexLimit * 100;
-    $dex10 = $general[dex10] / $_dexLimit * 100;
-    $dex20 = $general[dex20] / $_dexLimit * 100;
-    $dex30 = $general[dex30] / $_dexLimit * 100;
-    $dex40 = $general[dex40] / $_dexLimit * 100;
+    $dex0  = $general['dex0']  / $_dexLimit * 100;
+    $dex10 = $general['dex10'] / $_dexLimit * 100;
+    $dex20 = $general['dex20'] / $_dexLimit * 100;
+    $dex30 = $general['dex30'] / $_dexLimit * 100;
+    $dex40 = $general['dex40'] / $_dexLimit * 100;
 
     if($dex0 > 100) { $dex0 = 100; }
     if($dex10 > 100) { $dex10 = 100; }
@@ -2800,11 +2800,11 @@ function generalInfo2($connect, $no, $skin) {
     if($dex30 > 100) { $dex30 = 100; }
     if($dex40 > 100) { $dex40 = 100; }
 
-    $general[dex0]  = getDexCall($general[dex0]);
-    $general[dex10] = getDexCall($general[dex10]);
-    $general[dex20] = getDexCall($general[dex20]);
-    $general[dex30] = getDexCall($general[dex30]);
-    $general[dex40] = getDexCall($general[dex40]);
+    $general['dex0']  = getDexCall($general['dex0']);
+    $general['dex10'] = getDexCall($general['dex10']);
+    $general['dex20'] = getDexCall($general['dex20']);
+    $general['dex30'] = getDexCall($general['dex30']);
+    $general['dex40'] = getDexCall($general['dex40']);
 
     echo "<table width=498 border=1 cellspacing=0 cellpadding=0 bordercolordark=gray bordercolorlight=black style=font-size:13;word-break:break-all; id=bg2>
     <tr><td align=center colspan=6 id=bg1><b>추 가 정 보</b></td></tr>
diff --git a/twe/map.php b/twe/map.php
index 4cc69839..7ab98e5c 100644
--- a/twe/map.php
+++ b/twe/map.php
@@ -159,6 +159,11 @@ function showMap($connect, $type, $graphic) {
     $query = "select nation,name,color,capital from nation";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
     $count = MYDB_num_rows($result);
+    
+    $nationname = array();
+    $nationcolor = array();
+    $nationCapital = array();
+    
     for($i=1; $i <= $count; $i++) {
         $nation = MYDB_fetch_array($result);
         $nationcolor[$nation['nation']] = $nation['color'];
@@ -233,9 +238,7 @@ function showMap($connect, $type, $graphic) {
     210, 285, 275,  75, 160, 180, 255, 295, 315, 30, 325, 350, 260, 435
     );
 
-    $nationname = array();
-    $nationcolor = array();
-    $nationCapital = array();
+
     
     $query = "select name,level,nation,city,state,region,supply from city";
     $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -262,7 +265,7 @@ function showMap($connect, $type, $graphic) {
         else                        { $cap = 0; }
 
         city($graphic, $brouserIE,
-            $type, $name, $nation, $color, $level, $region, $i+1, $valid[$i+1], $x[$i], $y[$i],
+            $type, $name, $nation, $color, $level, $region, $i+1, isset($valid[$i+1])?$valid[$i+1]:0 , $x[$i], $y[$i],
             $state, $myCity, $city['supply'], $cap);
     }
 
diff --git a/twe/new_lib.php b/twe/new_lib.php
index 5158468e..b08635cd 100644
--- a/twe/new_lib.php
+++ b/twe/new_lib.php
@@ -1,6 +1,6 @@
 <?php
 //임시 땜빵 리팩터링.
-require "lib.php";
+require_once "lib.php";
 
 function dbConnRoot() {
     global $connect, $HTTP_COOKIE_VARS;