diff --git a/package.json b/package.json index 4d7a944..e4fd3e3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "salet", - "version": "1.6.9", + "version": "1.6.11", "description": "A general client-side framework for cybertext interactive fiction games.", "keywords": ["ifiction", "interactive fiction", "games", "coffee-script", "text", "menu"], "homepage": "http://salet.oreolek.ru", diff --git a/src/room.coffee b/src/room.coffee index 791e126..8b450e5 100644 --- a/src/room.coffee +++ b/src/room.coffee @@ -58,7 +58,7 @@ class SaletRoom salet.rooms[f].canExit? and ( salet.rooms[f].canExit == false or - salet.rooms[f].canExit.fcall(salet.rooms[f], this) == false + salet.rooms[f].canExit.fcall(salet.rooms[f], @name) == false ) and force == false ) @@ -138,9 +138,9 @@ class SaletRoom ) for description in unitDescriptions - retval += description.content + retval += " "+description.content - return retval + return markdown(retval) ### Places a unit in this room. diff --git a/src/salet.coffee b/src/salet.coffee index 3259697..d8f600c 100644 --- a/src/salet.coffee +++ b/src/salet.coffee @@ -6,7 +6,7 @@ There is only one instance of this class. ### class Salet constructor: (spec) -> - @version = "1.6.6" + @version = "1.6.11" @character = new Character # REDEFINE THIS IN YOUR GAME diff --git a/src/unit.coffee b/src/unit.coffee index 9982590..4d91f17 100644 --- a/src/unit.coffee +++ b/src/unit.coffee @@ -10,7 +10,7 @@ class SaletUnit @visible = true @look = (f) => if @dsc and @dsc != "" and @visible - text = markdown(@dsc.fcall(this, f).toString()) + text = @dsc.fcall(this, f).toString() # replace braces {{}} with link to _act_ return parsedsc(text, @name) @takeable = false