* Merge changes from prposed changes

[infobot.git] / src / Modules / dice.pl

diff --git a/src/Modules/dice.pl b/src/Modules/dice.pl
index 0a8876b3dc55509957086c92b285ad97ba446845..ebcd0b49d485853f8f660d8d432bdf672623af67 100755 (executable)
--- a/src/Modules/dice.pl
+++ b/src/Modules/dice.pl
@@ -79,6 +79,7 @@ sub dice::roll ($) {
        $retval .= " best $offset";
     } else {
         @result = @throws;
+        $retval .= " $sign $offset" if $sign;
     }
 
     my($sum) = 0;
@@ -87,7 +88,6 @@ sub dice::roll ($) {
     $sum -= $offset if  $sign eq '-';
     $sum *= $offset if ($sign eq '*' || $sign eq 'x');
     do { $sum /= $offset; $sum = int $sum; } if $sign eq '/';
-    $retval .= " $sign $offset" if $sign;
 
     return "$retval = $sum";
 }
@@ -191,3 +191,5 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 =cut
+
+# vim:ts=4:sw=4:expandtab:tw=80