From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Jan 2002 22:13:05 +0000 (+0000)
Subject: Beats, but not displayed properly.
X-Git-Tag: mergeup-1-2001-10-09-tell~4
X-Git-Url: https://git.distorted.org.uk/~mdw/ircbot/commitdiff_plain/e9f01f35b7be57f677be29263c544e94afda9819

Beats, but not displayed properly.
---

diff --git a/bot.tcl b/bot.tcl
index e021af7..eb65a0e 100755
--- a/bot.tcl
+++ b/bot.tcl
@@ -23,6 +23,10 @@ proc showintervalsecs {howlong abbrev} {
     return [showintervalsecs/[opt timeformat] $howlong $abbrev]
 }
 
+proc showintervalsecs/beat {howlong abbrev} {
+    return [format "%g B" [expr {$howlong/86.4}]]
+}
+
 proc showintervalsecs/ks {howlong abbrev} {
     if {$howlong < 1000} {
 	return "${howlong}s"
@@ -1042,6 +1046,7 @@ proc timeformat_desc {tf} {
     switch -exact $tf {
 	ks { return "Times will be displayed in seconds or kiloseconds." }
 	hms { return "Times will be displayed in hours, minutes, etc." }
+	beat { return "Times will be displayed in beats (1000B = 1d)." }
 	default { error "invalid timeformat: $v" }
     }
 }
@@ -1098,11 +1103,13 @@ def_setting marktime {
 	    s { set u 1 }
 	    ks { set u 1000 }
 	    m { set u 60 }
-	    h { set u 3600 }
+	    mb { set u 0.0864 }
+	    b { set u 86.4 }
+	    kb { set u 86400 }
 	    default { error "unknown unit of time $unit" }
 	}
 	if {$value > 86400*21/$u} { error "marktime interval too large" }
-	set mt [expr {$value*$u}]
+	set mt [expr {round($value*$u)}]
 	if {$mt < $marktime_min} { error "marktime interval too small" }
     } else {
 	error "invalid syntax for marktime"