From dbfc7e086ea6cea9ab9fa56d403a4224573b1798 Mon Sep 17 00:00:00 2001
From: Alexander Yakovlev <keloero@oreolek.ru>
Date: Wed, 2 Mar 2016 23:41:18 +0700
Subject: [PATCH] Fixed Booleans (again)

---
 lib/room.coffee | 4 ++--
 lib/view.coffee | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/room.coffee b/lib/room.coffee
index 072b0d2..e1be822 100644
--- a/lib/room.coffee
+++ b/lib/room.coffee
@@ -6,9 +6,9 @@ markdown = require('./markdown.coffee')
 
 assert = (msg, assertion) -> console.assert assertion, msg
 
-Function.prototype.fcall = Function.prototype.call;
+Function.prototype.fcall = Function.prototype.call
 Boolean.prototype.fcall = () ->
-  return this
+  return this.valueOf()
 String.prototype.fcall = () ->
   return this
 
diff --git a/lib/view.coffee b/lib/view.coffee
index ebbf0df..4d4d350 100644
--- a/lib/view.coffee
+++ b/lib/view.coffee
@@ -149,8 +149,8 @@ class SaletView
     if (not listOfIds? or listOfIds.length == 0)
       return
 
-    currentRoom = salet.getCurrentRoom();
-    $options = $("<ul>").addClass("options");
+    currentRoom = salet.getCurrentRoom()
+    $options = $("<ul>").addClass("options")
     for roomId in listOfIds
       room = salet.rooms[roomId]
       assert(room, "unknown_situation".l({id:roomId}))
@@ -162,7 +162,7 @@ class SaletView
         optionText = "choice".l({number:i+1})
       $option = $("<li>")
       $a = $("<span>")
-      if (room.canChoose.fcall(this, salet, currentRoom) == true)
+      if (room.canChoose.fcall(this, salet, currentRoom))
         $a = $("<a>").attr({href: roomId})
       $a.html(optionText)
       $option.html($a)
@@ -180,7 +180,7 @@ class SaletView
     for a in $('#content').find('a')
       a = $(a)
       if (a.hasClass('sticky') || a.attr("href").match(/[?&]sticky[=&]?/))
-        return;
+        return
       a.replaceWith($("<span>").addClass("ex_link").html(a.html()))
     contentToHide = $('#content .transient, #content ul.options')
     contentToHide.add($("#content a").filter(() ->