diff --git a/hwe/css/common.css b/hwe/css/common.css
index 0d87142d..2ce59561 100644
--- a/hwe/css/common.css
+++ b/hwe/css/common.css
@@ -48,6 +48,10 @@ select { font-family:'굴림'; line-height:100%; }
content:"◆";
}
+.small_war_log{
+ display:inline-block;
+}
+
.small_war_log .war_type_attack{
color:cyan;
}
diff --git a/hwe/process_war.php b/hwe/process_war.php
index 7a7df738..4d4e52f4 100644
--- a/hwe/process_war.php
+++ b/hwe/process_war.php
@@ -412,14 +412,14 @@ function processWar($general, $city) {
'killed_crew' => -$mykillnum
];
- $res = $templates->render('small_war_log',[
+ $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year,
'month'=>$month,
'war_type'=>'siege',
'war_type_str'=>'성',
'me' => $render_attacker,
'you' => $render_defender,
- ]);
+ ]));
$log[] = $res;//TODO: $log를 출력할 때 date에 대해선 숨겨야 함.
$batlog[] = $res;
@@ -1288,23 +1288,23 @@ function processWar($general, $city) {
'killed_crew' => -$opdeathnum
];
- $res = $templates->render('small_war_log',[
+ $res = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year,
'month'=>$month,
'war_type'=>'attack',
'war_type_str'=>'공',
'me' => $render_attacker,
'you' => $render_defender,
- ]);
+ ]));
- $oppres = $templates->render('small_war_log',[
+ $oppres = str_replace(["\r\n", "\r", "\n"], '', $templates->render('small_war_log',[
'year'=>$year,
'month'=>$month,
'war_type'=>'defense',
'war_type_str'=>'수',
'me' => $render_defender,
'you' => $render_attacker,
- ]);
+ ]));
$log[] = $res;
$batlog[] = $res;
diff --git a/hwe/templates/small_war_log.php b/hwe/templates/small_war_log.php
index d800289c..290046f5 100644
--- a/hwe/templates/small_war_log.php
+++ b/hwe/templates/small_war_log.php
@@ -16,9 +16,9 @@
- =$me['remain']?>
+ =$me['remain_crew']?>
- (=$me['killed']?>)
+ (=$me['killed_crew']?>)
@@ -27,9 +27,9 @@
- =$you['remain']?>
+ =$you['remain_crew']?>
- (=$you['killed']?>)
+ (=$you['killed_crew']?>)