From e487846c56f036c8df35768a6442aa0d34c220b5 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Tue, 10 Apr 2018 22:44:00 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A0=84=ED=88=AC=20=EB=A1=9C=EA=B7=B8=20?=
 =?UTF-8?q?=EB=B0=94=EA=BE=BC=EA=B2=83=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EC=95=88=EB=82=98=EC=98=A4=EB=8A=94=20=EA=B2=83=EC=9D=84=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/css/common.css              |  4 ++++
 hwe/process_war.php             | 12 ++++++------
 hwe/templates/small_war_log.php |  8 ++++----
 3 files changed, 14 insertions(+), 10 deletions(-)

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 @@
         </span>
 
         <span class="crew_plate">
-            <span class="remain_crew"><?=$me['remain']?></span>
+            <span class="remain_crew"><?=$me['remain_crew']?></span>
             <span class="killed_plate">
-                (<span class="killed_crew"><?=$me['killed']?></span>)
+                (<span class="killed_crew"><?=$me['killed_crew']?></span>)
             </span>
         </span>
     </span>
@@ -27,9 +27,9 @@
 
     <span class="you">
         <span class="crew_plate">
-            <span class="remain_crew"><?=$you['remain']?></span>
+            <span class="remain_crew"><?=$you['remain_crew']?></span>
             <span class="killed_plate">
-                (<span class="killed_crew"><?=$you['killed']?></span>)
+                (<span class="killed_crew"><?=$you['killed_crew']?></span>)
             </span>
         </span>