diff --git a/hwe/a_history.php b/hwe/a_history.php index 14a2ff9c..fd8354ad 100644 --- a/hwe/a_history.php +++ b/hwe/a_history.php @@ -21,7 +21,7 @@ $query = "select startyear,year,month,conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $admin = MYDB_fetch_array($result); -$query = "select map,con,turntime from general where owner='{$userID}'"; +$query = "select con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $me = MYDB_fetch_array($result); diff --git a/hwe/a_status.php b/hwe/a_status.php index bde3892f..b5951a47 100644 --- a/hwe/a_status.php +++ b/hwe/a_status.php @@ -17,7 +17,7 @@ $query = "select conlimit from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select map,con,turntime from general where owner='{$userID}'"; +$query = "select con,turntime from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_diplomacy.php b/hwe/b_diplomacy.php index f91cc616..b7abc682 100644 --- a/hwe/b_diplomacy.php +++ b/hwe/b_diplomacy.php @@ -16,7 +16,7 @@ $query = "select turnterm from game limit 1"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $admin = MYDB_fetch_array($result); -$query = "select no,nation,map from general where owner='{$userID}'"; +$query = "select no,nation from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $me = MYDB_fetch_array($result); diff --git a/hwe/b_myPage.php b/hwe/b_myPage.php index eb3cbde5..56a82064 100644 --- a/hwe/b_myPage.php +++ b/hwe/b_myPage.php @@ -5,18 +5,13 @@ include "lib.php"; include "func.php"; $btn = Util::getReq('btn'); -$map = Util::getReq('map', 'int', 0); $mode = Util::getReq('mode', 'int', 2); $tnmt = Util::getReq('tnmt', 'int', 1); extractMissingPostToGlobals(); -if($map < 0 || $map > 2){ - $map = 0; -} - -if($mode < 0 || $mode > 2){ - $mode = 2; +if($mode < 0 || $mode > 1){ + $mode = 1; } if($tnmt < 0 || $tnmt > 1){ @@ -51,13 +46,12 @@ if ($btn == "설정저장" && $me['myset'] > 0) { $db->update('general', [ 'myset'=>$db->sqleval('myset-1'), - 'map'=>$map, 'mode'=>$mode, 'tnmt'=>$tnmt ], 'owner=%i', $userID); } -$query = "select no,map,mode,tnmt,myset from general where owner='{$userID}'"; +$query = "select no,mode,tnmt,myset from general where owner='{$userID}'"; $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect), ""); $me = MYDB_fetch_array($result); @@ -91,11 +85,6 @@ function go(type) {
-     지도수준 【 - >상세 - >간단 - >생략 - 】

    토너먼트 【 >수동참여 >자동참여 diff --git a/hwe/index.php b/hwe/index.php index 942cb9ba..96174ff4 100644 --- a/hwe/index.php +++ b/hwe/index.php @@ -18,7 +18,7 @@ if (!$userID) { } $me = $db->queryFirstRow( - 'SELECT no,con,turntime,newmsg,newvote,map from general where owner = %i', + 'SELECT no,con,turntime,newmsg,newvote from general where owner = %i', $userID ); diff --git a/hwe/select_npc_post.php b/hwe/select_npc_post.php index 5fb153b3..489d0970 100644 --- a/hwe/select_npc_post.php +++ b/hwe/select_npc_post.php @@ -101,7 +101,6 @@ $db->update('general', [ 'npc'=>1, 'killturn'=>6, 'mode'=>2, - 'map'=>0, 'owner'=>$userID ], 'no=%i and npc=2', $npcID); $affected = $db->affectedRows(); diff --git a/hwe/sql/schema.sql b/hwe/sql/schema.sql index ae9a5185..d3014e4c 100644 --- a/hwe/sql/schema.sql +++ b/hwe/sql/schema.sql @@ -80,7 +80,6 @@ CREATE TABLE `general` ( `specage2` INT(2) NULL DEFAULT '0', `mode` INT(1) NULL DEFAULT '2', `tnmt` INT(1) NULL DEFAULT '1', - `map` INT(1) NULL DEFAULT '0', `myset` INT(1) NULL DEFAULT '3', `tournament` INT(1) NULL DEFAULT '0', `vote` INT(1) NULL DEFAULT '0', @@ -152,7 +151,7 @@ CREATE TABLE `general` ( `recturn` CHAR(14) NULL DEFAULT '', `resturn` CHAR(14) NULL DEFAULT '', PRIMARY KEY (`no`), - INDEX `nation` (`nation`), + INDEX `nation` (`nation`, `npc`) INDEX `city` (`city`), INDEX `turntime` (`turntime`, `no`), INDEX `no_member` (`owner`),