devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

간단한 국가 정보를 가져오는 코드들을 일부 통합.

Browse Source
This commit is contained in:
Hide_D
2018-02-26 01:46:13 +09:00
parent 2cd7d525a4
commit 7efc03813b
14 changed files with 120 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
twe/b_currentCity.php
+1 -3
View File
@@ -137,9 +137,7 @@ $query = "select * from city where city='{$_REQUEST['citylist']}'"; // 도시
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$city = MYDB_fetch_array($cityresult); $city = MYDB_fetch_array($cityresult);
$query = "select nation,name,color from nation where nation='{$city['nation']}'"; $nation = getNationStaticInfo($city['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$query = "select name from general where no='{$city['gen1']}'"; // 태수 이름 $query = "select name from general where no='{$city['gen1']}'"; // 태수 이름
$genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $genresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/b_myCityInfo.php
+1 -3
View File
@@ -60,9 +60,7 @@ $query = "select nation from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result); $me = MYDB_fetch_array($result);
$query = "select color,capital from nation where nation='{$me['nation']}'"; $nation = getNationStaticInfo($me['nation']); //국가정보
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result); //국가정보
switch($type) { switch($type) {
case 1: $query = "select *,pop/pop2 as poprate from city where nation='{$me['nation']}'"; break; case 1: $query = "select *,pop/pop2 as poprate from city where nation='{$me['nation']}'"; break;
twe/b_myGenInfo.php
+3 -5
View File
@@ -60,10 +60,8 @@ if($me['skin'] < 1) {
</td></tr> </td></tr>
</table> </table>
<?php <?php
$query = "select level from nation where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$nationLevel = getDB()->queryFirstField('select level from nation where nation = %i', $me['nation']);
switch($type) { switch($type) {
case 1: $query = "select npc,special,special2,personal,picture,imgsvr,name,level,dedication,experience,injury,leader,power,intel,gold,rice,belong,connect,killturn from general where nation='{$me['nation']}' order by level desc"; break; case 1: $query = "select npc,special,special2,personal,picture,imgsvr,name,level,dedication,experience,injury,leader,power,intel,gold,rice,belong,connect,killturn from general where nation='{$me['nation']}' order by level desc"; break;
case 2: $query = "select npc,special,special2,personal,picture,imgsvr,name,level,dedication,experience,injury,leader,power,intel,gold,rice,belong,connect,killturn from general where nation='{$me['nation']}' order by dedication desc"; break; case 2: $query = "select npc,special,special2,personal,picture,imgsvr,name,level,dedication,experience,injury,leader,power,intel,gold,rice,belong,connect,killturn from general where nation='{$me['nation']}' order by dedication desc"; break;
@@ -107,9 +105,9 @@ for($j=0; $j < $gencount; $j++) {
$general = MYDB_fetch_array($genresult); $general = MYDB_fetch_array($genresult);
if($general['level'] == 12) { if($general['level'] == 12) {
$lbonus = $nation['level'] * 2; $lbonus = $nationLevel * 2;
} elseif($general['level'] >= 5) { } elseif($general['level'] >= 5) {
$lbonus = $nation['level']; $lbonus = $nationLevel;
} else { } else {
$lbonus = 0; $lbonus = 0;
} }
twe/c_vote.php
+4 -4
View File
@@ -60,10 +60,10 @@ if($btn == "수정" && $me['userlevel'] >= 5) {
$comment = trim($comment); $comment = trim($comment);
$comment = addslashes(SQ2DQ($comment)); $comment = addslashes(SQ2DQ($comment));
$query = "select name from nation where nation='{$me['nation']}'"; $nation = getNationStaticInfo($me['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($nation == null) {
$nation = MYDB_fetch_array($result); $nation['name'] = "재야";
if($nation['name'] == "") { $nation['name'] = "재야"; } }
if($admin['votecomment'] != "") { $admin['votecomment'] .= "|"; } if($admin['votecomment'] != "") { $admin['votecomment'] .= "|"; }
$admin['votecomment'] .= "{$nation['name']}:{$me['name']}:{$comment}"; $admin['votecomment'] .= "{$nation['name']}:{$me['name']}:{$comment}";
twe/event_1.php
+1 -1
View File
@@ -48,7 +48,7 @@ if($admin['isUnited'] == 0) {
} }
// 수도가 이성인경우 옆으로 이전, 또는 랜덤 // 수도가 이성인경우 옆으로 이전, 또는 랜덤
$query = "select nation from nation where capital=63 or capital=64 or capital=65 or capital=66 or capital=67 or capital=68 or capital=69"; $query = "select nation from nation where capital in (63,64,65,66,67,68,69)"; //NOTE: 이성의 여부가 하드코딩 되어있다. 물론 국가 수와 도시가 정해져있으므로 큰 문제는 없다.
$result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error("scenario_194A ".MYDB_error($connect),"");
$count = MYDB_num_rows($result); $count = MYDB_num_rows($result);
twe/func.php
+22 -61
View File
@@ -350,9 +350,7 @@ function getTurn($connect, $general, $type, $font=1) {
case 25: //임관 case 25: //임관
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if(!$nation['name']) { $nation['name'] = '????'; } if(!$nation['name']) { $nation['name'] = '????'; }
@@ -566,9 +564,7 @@ function getCoreTurn($connect, $nation, $level) {
case 51: //항복권고 case 51: //항복권고
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에게 항복 권고"; $str[$i] = "【{$nation['name']}】에게 항복 권고";
break; break;
@@ -577,9 +573,7 @@ function getCoreTurn($connect, $nation, $level) {
$third = $command[2]; $third = $command[2];
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$fourth *= 1000; $fourth *= 1000;
$third *= 1000; $third *= 1000;
@@ -592,9 +586,7 @@ function getCoreTurn($connect, $nation, $level) {
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 【{$general['makenation']}】(으)로 통합 제의"; $str[$i] = "【{$nation['name']}】에 【{$general['makenation']}】(으)로 통합 제의";
break; break;
@@ -602,36 +594,28 @@ function getCoreTurn($connect, $nation, $level) {
$third = $command[2]; $third = $command[2];
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 {$third}년 불가침 제의"; $str[$i] = "【{$nation['name']}】에 {$third}년 불가침 제의";
break; break;
case 62: //선전 포고 case 62: //선전 포고
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 선전 포고"; $str[$i] = "【{$nation['name']}】에 선전 포고";
break; break;
case 63: //종전 제의 case 63: //종전 제의
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 종전 제의"; $str[$i] = "【{$nation['name']}】에 종전 제의";
break; break;
case 64: //파기 제의 case 64: //파기 제의
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 파기 제의"; $str[$i] = "【{$nation['name']}】에 파기 제의";
break; break;
@@ -676,9 +660,7 @@ function getCoreTurn($connect, $nation, $level) {
case 75: //피장파장 case 75: //피장파장
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 피장파장"; $str[$i] = "【{$nation['name']}】에 피장파장";
break; break;
@@ -688,18 +670,14 @@ function getCoreTurn($connect, $nation, $level) {
case 77: //이호경식 case 77: //이호경식
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 이호경식"; $str[$i] = "【{$nation['name']}】에 이호경식";
break; break;
case 78: //급습 case 78: //급습
$double = $command[1]; $double = $command[1];
$query = "select name from nation where nation='$double'"; $nation = getNationStaticInfo($double);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$str[$i] = "【{$nation['name']}】에 급습"; $str[$i] = "【{$nation['name']}】에 급습";
break; break;
@@ -734,9 +712,7 @@ function cityInfo($connect) {
// 도시 정보 // 도시 정보
$city = getCity($connect, $me['city']); $city = getCity($connect, $me['city']);
$query = "select name,color from nation where nation='{$city['nation']}'"; $nation = getNationStaticInfo($city['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$pop = $city['pop'] / $city['pop2'] * 100; $pop = $city['pop'] / $city['pop2'] * 100;
$rate = $city['rate']; $rate = $city['rate'];
@@ -1037,9 +1013,7 @@ function commandTable($connect) {
$troop = getTroop($connect, $me['troop']); $troop = getTroop($connect, $me['troop']);
$city = getCity($connect, $me['city']); $city = getCity($connect, $me['city']);
$query = "select nation from nation"; $nationcount = count(getAllNationStaticInfo());
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($result);
$query = "select city from city where nation='{$me['nation']}'"; $query = "select city from city where nation='{$me['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1049,9 +1023,7 @@ function commandTable($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$gencount = MYDB_num_rows($result); $gencount = MYDB_num_rows($result);
$query = "select type,level from nation where nation='{$me['nation']}'"; $nation = getNationStaticInfo($me['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$develcost = $admin['develcost']; $develcost = $admin['develcost'];
$develcostA = $admin['develcost']; $colorA = 0; $develcostA = $admin['develcost']; $colorA = 0;
@@ -1380,9 +1352,7 @@ function generalInfo($connect, $no, $skin) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result); $general = MYDB_fetch_array($result);
$query = "select nation,level,color from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if($general['level'] == 12) { if($general['level'] == 12) {
$lbonus = $nation['level'] * 2; $lbonus = $nation['level'] * 2;
@@ -1932,6 +1902,7 @@ function MyHistory($connect, $no, $skin) {
} }
function addHistory($connect, $me, $history) { function addHistory($connect, $me, $history) {
//FIXME: update 쿼리만으로도 구성 가능해보임.
$me['history'] = "{$history}<br>{$me['history']}"; $me['history'] = "{$history}<br>{$me['history']}";
$query = "update general set history='{$me['history']}' where no='{$me['no']}'"; $query = "update general set history='{$me['history']}' where no='{$me['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -1940,6 +1911,7 @@ function addHistory($connect, $me, $history) {
} }
function addNationHistory($connect, $nation, $history) { function addNationHistory($connect, $nation, $history) {
//FIXME: update 쿼리만으로도 구성 가능해보임.
$nation['history'] = "{$nation['history']}{$history}<br>"; $nation['history'] = "{$nation['history']}{$history}<br>";
$query = "update nation set history='{$nation['history']}' where nation='{$nation['nation']}'"; $query = "update nation set history='{$nation['history']}' where nation='{$nation['nation']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2553,13 +2525,8 @@ function checkDelay($connect) {
} }
function updateOnline($connect) { function updateOnline($connect) {
$query = "select nation,name from nation";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
//국가별 이름 매핑 //국가별 이름 매핑
for($i=0; $i < $count; $i++) { foreach(getAllNationStaticInfo() as $nation) {
$nation = MYDB_fetch_array($result);
$nationname[$nation['nation']] = $nation['name']; $nationname[$nation['nation']] = $nation['name'];
} }
$nationname[0] = "재야"; $nationname[0] = "재야";
@@ -3412,9 +3379,7 @@ function CheckHall($connect, $no) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$general = MYDB_fetch_array($result); $general = MYDB_fetch_array($result);
$query = "select nation,name,color from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$nationresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($nationresult);
for($k=0; $k < 21; $k++) { for($k=0; $k < 21; $k++) {
$query = "select * from hall where type='$k' order by data desc"; $query = "select * from hall where type='$k' order by data desc";
@@ -3545,11 +3510,9 @@ function uniqueItem($connect, $general, $log, $vote=0) {
$query = "update general set {$type}='$it' where no='{$general['no']}'"; $query = "update general set {$type}='$it' where no='{$general['no']}'";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "select name from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if($nation['name'] == "") { if($nation == null) {
$nation['name'] = "재야"; $nation['name'] = "재야";
} }
@@ -3746,9 +3709,7 @@ function deleteNation($connect, $general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select name from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$history[count($history)] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<R><b>【멸망】</b></><D><b>{$nation['name']}</b></>은(는) <R>멸망</>했습니다."; $history[count($history)] = "<C>●</>{$admin['year']}년 {$admin['month']}월:<R><b>【멸망】</b></><D><b>{$nation['name']}</b></>은(는) <R>멸망</>했습니다.";
twe/func_gamerule.php
+23 -14
View File
@@ -391,22 +391,24 @@ function checkSupply($connect) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
//도시 있는 국가들 //도시 있는 국가들
$query = "select nation,capital from nation where level>'0'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationNum = MYDB_num_rows($result);
$str = "city='0'"; $str = "city='0'";
for($i=0; $i < $nationNum; $i++) {
$nation = MYDB_fetch_array($result); //TODO: in 을 쓰는게 낫다
//수도 있는 덩어리 도시들 1로 세팅 foreach(getAllNationStaticInfo() as $nation){
if($nation['level'] <= 0){
continue;
}
$lbl = $label[$nation['capital']]; $lbl = $label[$nation['capital']];
for($k=1; $k <= $cityNum; $k++) { for ($k=1; $k <= $cityNum; $k++) {
if($lbl == $label[$k]) { if ($lbl == $label[$k]) {
$str .= " or city='{$k}'"; $str .= " or city='{$k}'";
} }
} }
} }
$query = "update city set supply='1' where {$str}"; $query = "update city set supply='1' where {$str}";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
} }
@@ -736,12 +738,15 @@ function checkWander($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$needRefresh = false;
// 국가정보, 장수수 // 국가정보, 장수수
$query = "select nation from nation where level=0"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); if($nation['level'] != 0){
$nationcount = MYDB_num_rows($result); continue;
for($i=0; $i < $nationcount; $i++) { }
$nation = MYDB_fetch_array($result);
$needRefresh = true;
$query = "select no,name,nation,level,history,turntime from general where nation='{$nation['nation']}' and level=12"; $query = "select no,name,nation,level,history,turntime from general where nation='{$nation['nation']}' and level=12";
$kingResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $kingResult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -749,9 +754,12 @@ function checkWander($connect) {
$log[0] = "<C>●</>초반 제한후 방랑군은 자동 해산됩니다."; $log[0] = "<C>●</>초반 제한후 방랑군은 자동 해산됩니다.";
pushGenLog($king, $log); pushGenLog($king, $log);
process_56($connect, $king); process_56($connect, $king);
} }
if($needRefresh){
refreshNationStaticInfo();
}
} }
function checkMerge($connect) { function checkMerge($connect) {
@@ -791,6 +799,7 @@ function checkMerge($connect) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$npccount2 = MYDB_num_rows($result); $npccount2 = MYDB_num_rows($result);
//TODO: 로그 기록에 대한 쿼리는 한번만 할 수 있다.
//피항복국 장수들 역사 기록 및 로그 전달 //피항복국 장수들 역사 기록 및 로그 전달
$query = "select no,name,nation,history from general where nation='{$you['nation']}'"; $query = "select no,name,nation,history from general where nation='{$you['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/func_message.php
+6 -15
View File
@@ -289,11 +289,7 @@ function genList($connect) {
<optgroup label='국가메세지'> <optgroup label='국가메세지'>
<option value=9000>【 재야 】</option>"; <option value=9000>【 재야 】</option>";
$query = "select nation,name,color from nation order by binary(name)"; foreach(getAllNationStaticInfo() as $nation) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
$nationNation[$nation['nation']] = $nation['nation']; $nationNation[$nation['nation']] = $nation['nation'];
$nationName[$nation['nation']] = $nation['name']; $nationName[$nation['nation']] = $nation['name'];
$nationColor[$nation['nation']] = $nation['color']; $nationColor[$nation['nation']] = $nation['color'];
@@ -321,7 +317,7 @@ function genList($connect) {
echo " echo "
</optgroup>"; </optgroup>";
$query = "select nation,name,color from nation order by binary(name)"; $query = "select nation,name,color from nation order by name";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$count = MYDB_num_rows($result); $count = MYDB_num_rows($result);
for($i=1; $i <= $count; $i++) { for($i=1; $i <= $count; $i++) {
@@ -383,6 +379,7 @@ function MsgFile($skin, $bg, $nation=0, $level=0) {
// type : xx,xx(불가침기간,타입) // type : xx,xx(불가침기간,타입)
// who : xxxx,xxxx(발신인, 수신인) // who : xxxx,xxxx(발신인, 수신인)
function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) { function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) {
//FIXME: 폐기
$query = "select skin,no,nation,name,picture,level from general where owner='{$_SESSION['noMember']}'"; $query = "select skin,no,nation,name,picture,level from general where owner='{$_SESSION['noMember']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$me = MYDB_fetch_array($result); $me = MYDB_fetch_array($result);
@@ -403,9 +400,7 @@ function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) {
$sndrnation['name'] = '재야'; $sndrnation['name'] = '재야';
$sndrnation['color'] = 'FFFFFF'; $sndrnation['color'] = 'FFFFFF';
} else { } else {
$query = "select name,color from nation where nation='{$sndr['nation']}'"; $sndrnation = getNationStaticInfo($sndr['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$sndrnation = MYDB_fetch_array($result);
} }
switch($bg) { switch($bg) {
@@ -420,9 +415,7 @@ function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) {
ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $sndr['name'], $sndrnation['color'], $msg, $date, $num, $from, $term, $me['level'], $dip['reserved']); ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $sndr['name'], $sndrnation['color'], $msg, $date, $num, $from, $term, $me['level'], $dip['reserved']);
} elseif($category <= 8) { } elseif($category <= 8) {
$query = "select name,color from nation where nation='$to'"; $rcvrnation = getNationStaticInfo($to);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$rcvrnation = MYDB_fetch_array($result);
ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $rcvrnation['name'], $rcvrnation['color'], $msg, $date, $num, $from, $term, $me['level']); ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], $rcvrnation['name'], $rcvrnation['color'], $msg, $date, $num, $from, $term, $me['level']);
} elseif($category <= 11) { } elseif($category <= 11) {
@@ -434,9 +427,7 @@ function DecodeMsg($connect, $msg, $type, $who, $date, $bg, $num=0) {
$rcvrnation['name'] = '재야'; $rcvrnation['name'] = '재야';
$rcvrnation['color'] = 'FFFFFF'; $rcvrnation['color'] = 'FFFFFF';
} else { } else {
$query = "select name,color from nation where nation='{$rcvr['nation']}'"; $rcvrnation = getNationStaticInfo($rcvr['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$rcvrnation = MYDB_fetch_array($result);
} }
ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], "{$rcvr['name']}:{$rcvrnation['name']}", $rcvrnation['color'], $msg, $date, $num, $from, $term); ShowMsg($me['skin'], $bgcolor, $category, $sndr['picture'], $sndr['imgsvr'], "{$sndr['name']}:{$sndrnation['name']}▶", $sndrnation['color'], "{$rcvr['name']}:{$rcvrnation['name']}", $rcvrnation['color'], $msg, $date, $num, $from, $term);
} }
twe/func_process.php
+16 -36
View File
@@ -1059,9 +1059,7 @@ function process_14($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select level from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$lbonus = setLeadershipBonus($general, $nation['level']); $lbonus = setLeadershipBonus($general, $nation['level']);
@@ -1346,9 +1344,7 @@ function process_21($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
if($general['level'] == 12) { if($general['level'] == 12) {
$query = "select level from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if($nation['level'] == 0) { if($nation['level'] == 0) {
$query = "update general set city='$destination' where nation='{$general['nation']}'"; $query = "update general set city='$destination' where nation='{$general['nation']}'";
@@ -1895,9 +1891,7 @@ function process_28($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select level,capital from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if($nation['level'] == 0) { if($nation['level'] == 0) {
$log[count($log)] = "<C>●</>{$admin['month']}월:방랑군입니다. 귀환 실패. <1>$date</>"; $log[count($log)] = "<C>●</>{$admin['month']}월:방랑군입니다. 귀환 실패. <1>$date</>";
@@ -2242,9 +2236,7 @@ function process_30($connect, &$general) {
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
if($general['level'] == 12) { if($general['level'] == 12) {
$query = "select level from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
if($nation['level'] == 0) { if($nation['level'] == 0) {
$query = "update general set city='$destination' where nation='{$general['nation']}'"; $query = "update general set city='$destination' where nation='{$general['nation']}'";
@@ -2675,9 +2667,7 @@ function process_34($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result); $destcity = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'"; $mynation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
$query = "select nation,supply from city where city='{$general['city']}'"; $query = "select nation,supply from city where city='{$general['city']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
@@ -2799,9 +2789,7 @@ function process_35($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result); $destcity = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'"; $mynation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
$lbonus = setLeadershipBonus($general, $mynation['level']); $lbonus = setLeadershipBonus($general, $mynation['level']);
@@ -2925,9 +2913,7 @@ function process_36($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$destcity = MYDB_fetch_array($result); $destcity = MYDB_fetch_array($result);
$query = "select level,type from nation where nation='{$general['nation']}'"; $mynation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
$lbonus = setLeadershipBonus($general, $mynation['level']); $lbonus = setLeadershipBonus($general, $mynation['level']);
@@ -3707,9 +3693,7 @@ function process_47($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select name,level from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
//현재 외교 진행중(평시, 불가침만 제외)일때 //현재 외교 진행중(평시, 불가침만 제외)일때
$query = "select state from diplomacy where me='{$general['nation']}' and state!='2' and state!='7'"; $query = "select state from diplomacy where me='{$general['nation']}' and state!='2' and state!='7'";
@@ -3876,9 +3860,7 @@ function process_49($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select level from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$city = getCity($connect, $general['city']); $city = getCity($connect, $general['city']);
@@ -4379,14 +4361,14 @@ function process_55($connect, &$general) {
$nation = addNationHistory($connect, $nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>(이)가 <G><b>{$city['name']}</b></>에서 거병"); $nation = addNationHistory($connect, $nation, "<C>●</>{$admin['year']}년 {$admin['month']}월:<Y>{$general['name']}</>(이)가 <G><b>{$city['name']}</b></>에서 거병");
// 외교테이블 추가 // 외교테이블 추가
$query = "select nation from nation where nation!='{$nation['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nationcount = MYDB_num_rows($result);
refreshNationStaticInfo(); refreshNationStaticInfo();
for($i=0; $i < $nationcount; $i++) { foreach(getAllNationStaticInfo() as $younation){
$younation = MYDB_fetch_array($result); if($nation['nation'] == $you['nation']){
continue;
}
//FIXME: 쿼리 개선. foreach문은 굳이 필요없을것
$query = "insert into diplomacy (me, you, state, term) values ('{$nation['nation']}', '{$younation['nation']}', '2', '0')"; $query = "insert into diplomacy (me, you, state, term) values ('{$nation['nation']}', '{$younation['nation']}', '2', '0')";
MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$query = "insert into diplomacy (me, you, state, term) values ('{$younation['nation']}', '{$nation['nation']}', '2', '0')"; $query = "insert into diplomacy (me, you, state, term) values ('{$younation['nation']}', '{$nation['nation']}', '2', '0')";
@@ -4407,9 +4389,7 @@ function process_56($connect, &$general) {
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$admin = MYDB_fetch_array($result); $admin = MYDB_fetch_array($result);
$query = "select name from nation where nation='{$general['nation']}'"; $nation = getNationStaticInfo($general['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($result);
$query = "select city from city where nation='{$general['nation']}'"; $query = "select city from city where nation='{$general['nation']}'";
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/func_time_event.php
+1 -3
View File
@@ -432,9 +432,7 @@ function getRiceIncome($connect, $nationNo, $rate, $admin_rate, $type) {
$level2[$gen['no']] = $gen['city']; $level2[$gen['no']] = $gen['city'];
} }
$query = "select capital,level from nation where nation='$nationNo'"; // 수도 $nation = getNationStaticInfo($nationNo);
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$nation = MYDB_fetch_array($cityresult);
$query = "select * from city where nation='$nationNo' and supply='1'"; // 도시 목록 $query = "select * from city where nation='$nationNo' and supply='1'"; // 도시 목록
$cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),""); $cityresult = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
twe/j_msgsubmit.php
+1 -1
View File
@@ -94,7 +94,7 @@ $src = [
'nation' => null 'nation' => null
]; ];
if($src['nation_id'] != 0) { if($src['nation_id'] != 0) {
$nation = $db->queryFirstRow('select nation,name,color from nation where nation=%i',$src_nation_id); $nation = getNationStaticInfo($src_nation_id);
$src['nation'] = $nation['name']; $src['nation'] = $nation['name'];
$src['color'] = '#'.$nation['color']; $src['color'] = '#'.$nation['color'];
$src['color'] = str_replace('##', '#', $src['color']); //FIXME: nation table에서 color가 #포함된 걸로 바뀔 경우를 대비 $src['color'] = str_replace('##', '#', $src['color']); //FIXME: nation table에서 color가 #포함된 걸로 바뀔 경우를 대비
twe/processing.php
+39 -63
View File
@@ -1244,13 +1244,7 @@ function command_22($connect, $turn, $command) {
<option value={$general['no']} {$style}>{$general['name']}</option>"; <option value={$general['no']} {$style}>{$general['name']}</option>";
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
echo "<option style=color:{$nation['color']}>【 {$nation['name']} 】</option>"; echo "<option style=color:{$nation['color']}>【 {$nation['name']} 】</option>";
$query = "select no,name,npc from general where nation='{$nation['nation']}' and level!='12' and npc<2 order by npc,binary(name)"; $query = "select no,name,npc from general where nation='{$nation['nation']}' and level!='12' and npc<2 order by npc,binary(name)";
@@ -1959,12 +1953,10 @@ function command_46($connect, $turn, $command) {
$color = GetNationColors(); $color = GetNationColors();
$query = "select color from nation where level>0"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("command_46 ".MYDB_error($connect),""); if($nation['level'] <= 0){
$nationcount = MYDB_num_rows($result); continue;
}
for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($result);
$nationcolor[$i] = $nation['color']; $nationcolor[$i] = $nation['color'];
} }
$validCount = count($color); $validCount = count($color);
@@ -2214,9 +2206,7 @@ function command_52($connect, $turn, $command) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$me = MYDB_fetch_array($result); $me = MYDB_fetch_array($result);
$query = "select nation,level from nation where nation='{$me['nation']}'"; $mynation = getNationStaticInfo($me['nation']);
$result = MYDB_query($query, $connect) or Error(__LINE__.MYDB_error($connect),"");
$mynation = MYDB_fetch_array($result);
echo " echo "
타국에게 원조합니다.<br> 타국에게 원조합니다.<br>
@@ -2232,12 +2222,7 @@ function command_52($connect, $turn, $command) {
<form name=form1 action=c_double.php method=post> <form name=form1 action=c_double.php method=post>
대상 국가 <select name=double size=1 style=color:white;background-color:black>"; 대상 국가 <select name=double size=1 style=color:white;background-color:black>";
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation) {
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
$count = MYDB_num_rows($result);
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>"; echo "<option style=color:{$nation['color']} value={$nation['nation']}>【 {$nation['name']} 】</option>";
} }
@@ -2420,12 +2405,11 @@ function command_61($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "red"; break; case 0: $color = "red"; break;
case 1: $color = "red"; break; case 1: $color = "red"; break;
@@ -2502,12 +2486,10 @@ function command_62($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
//합병중 국가는 안됨 //합병중 국가는 안됨
$query = "select state from diplomacy where me='{$nation['nation']}' and (state='3' or state='5')"; $query = "select state from diplomacy where me='{$nation['nation']}' and (state='3' or state='5')";
$tempresult = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); $tempresult = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),"");
@@ -2565,12 +2547,11 @@ function command_63($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "black"; break; case 0: $color = "black"; break;
case 1: $color = "black"; break; case 1: $color = "black"; break;
@@ -2621,12 +2602,11 @@ function command_64($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "red"; break; case 0: $color = "red"; break;
case 1: $color = "red"; break; case 1: $color = "red"; break;
@@ -2936,12 +2916,11 @@ function command_75($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "black"; break; case 0: $color = "black"; break;
case 1: $color = "black"; break; case 1: $color = "black"; break;
@@ -2993,12 +2972,11 @@ function command_77($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "black"; break; case 0: $color = "black"; break;
case 1: $color = "black"; break; case 1: $color = "black"; break;
@@ -3050,12 +3028,11 @@ function command_78($connect, $turn, $command) {
$diplomacy[$dip['you']] = $dip['state']; $diplomacy[$dip['you']] = $dip['state'];
} }
$query = "select nation,name,color from nation where nation!='{$me['nation']}'"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("aaa_processing.php ".MYDB_error($connect),""); if($nation['nation'] == $me['nation']){
$count = MYDB_num_rows($result); continue;
}
for($i=1; $i <= $count; $i++) {
$nation = MYDB_fetch_array($result);
switch($diplomacy[$nation['nation']]) { switch($diplomacy[$nation['nation']]) {
case 0: $color = "red"; break; case 0: $color = "red"; break;
case 1: $color = "black"; break; case 1: $color = "black"; break;
@@ -3088,12 +3065,11 @@ function command_81($connect, $turn, $command) {
$color = GetNationColors(); $color = GetNationColors();
$query = "select color from nation where level>0"; foreach(getAllNationStaticInfo() as $nation){
$result = MYDB_query($query, $connect) or Error("command_46 ".MYDB_error($connect),""); if($nation['level'] <= 0){
$nationcount = MYDB_num_rows($result); continue;
}
for($i=0; $i < $nationcount; $i++) {
$nation = MYDB_fetch_array($result);
$nationcolor[$i] = $nation['color']; $nationcolor[$i] = $nation['color'];
} }
$validCount = count($color); $validCount = count($color);
twe/queue.php
+1
View File
@@ -1,4 +1,5 @@
<?php <?php
//TODO: 참조 값을 SplQueue ( https://secure.php.net/manual/en/class.splqueue.php )를 이용하도록 변경
class Queue { class Queue {
private $capacity; private $capacity;
private $size; private $size;
twe/schema.php
+1 -1
View File
@@ -179,7 +179,7 @@ $nation_schema = "
create table nation ( create table nation (
nation int(6) not null auto_increment, nation int(6) not null auto_increment,
name char(64) not null, `name` CHAR(64) NOT NULL COLLATE 'utf8_bin',
color char(10) not null, colset int(1) default 1, color char(10) not null, colset int(1) default 1,
onlinegen varchar(1024) default '', onlinegen varchar(1024) default '',
msg text default '', msg text default '',