From: masakih <masakih@users.sourceforge.jp>
Date: Wed, 22 Jul 2015 13:13:31 +0000 (+0900)
Subject: 泊地修理カウンターを0分が過ぎたらマイナスで表示し続けるようにした
X-Git-Tag: 1.3beta7~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0e2de11cc6f0e89a5177299dcb8e8f037d8d9f65;p=kcd%2FKCD.git

泊地修理カウンターを0分が過ぎたらマイナスで表示し続けるようにした
---

diff --git a/KCD/HMFleetViewController.m b/KCD/HMFleetViewController.m
index b341f2f8..655a2153 100644
--- a/KCD/HMFleetViewController.m
+++ b/KCD/HMFleetViewController.m
@@ -446,10 +446,7 @@ const NSInteger maxFleetNumber = 4;
 	NSTimeInterval compTime = [compTimeValue timeIntervalSince1970];
 	NSDate *now = [NSDate dateWithTimeIntervalSinceNow:0];
 	NSTimeInterval diff = compTime - [now timeIntervalSince1970];
-	
-	NSTimeInterval repairTime = diff + 20 * 60;
-	repairTime = repairTime > 0 ? repairTime : 0;
-	return @(repairTime);
+	return @(diff + 20 * 60);
 }
 
 @end
diff --git a/KCD/HMTimerCountFormatter.m b/KCD/HMTimerCountFormatter.m
index 31ba4d61..5e483bf5 100644
--- a/KCD/HMTimerCountFormatter.m
+++ b/KCD/HMTimerCountFormatter.m
@@ -20,6 +20,9 @@
 		NSLog(@"obj class is %@", NSStringFromClass([obj class]));
 		return @"";
 	}
+	
+	BOOL minus = timeInterval < 0;
+	if(minus) timeInterval *= -1;
 		
 	NSInteger hour = timeInterval / (60 * 60);
 	timeInterval -= hour * 60 * 60;
@@ -27,6 +30,6 @@
 	timeInterval -= minutes * 60;
 	NSInteger seconds = timeInterval;
 	
-	return [NSString stringWithFormat:@"%02ld:%02ld:%02ld", hour, minutes, seconds];
+	return [NSString stringWithFormat:@"%s%02ld:%02ld:%02ld", minus ? "-" : "", hour, minutes, seconds];
 }
 @end