diff --git a/devel/js/main.js b/devel/js/main.js index 3b1ee5c..564fa86 100644 --- a/devel/js/main.js +++ b/devel/js/main.js @@ -3,9 +3,8 @@ var situation = require('raconteur/situation.js'), oneOf = require('raconteur/oneOf.js'), elements = require('raconteur/elements.js'), qualities = require('raconteur/qualities.js'), - racontest = require('raconteur/racontest.js'); - -situation.exportUndum(); + racontest = require('raconteur/racontest.js'), + undum = require('undum-commonjs'); var a = elements.a, span = elements.span; diff --git a/lib/qualities.js b/lib/qualities.js index cb53181..28f1562 100644 --- a/lib/qualities.js +++ b/lib/qualities.js @@ -24,8 +24,8 @@ all copies or substantial portions of the Software. groups as objects, which contain qualities that themselves hold definitions. */ -var situation = require('./situation.js'); -situation.exportUndum(); +var situation = require('./situation.js'), + undum = require('undum-commonjs'); var qualities = function (spec) { Object.keys(spec).forEach(function(group) { diff --git a/lib/situation.js b/lib/situation.js index 87b5798..d3e66d9 100644 --- a/lib/situation.js +++ b/lib/situation.js @@ -231,11 +231,4 @@ RaconteurSituation.prototype.act = function (character, system, action) { module.exports = function (name, spec) { spec.name = name; return (undum.game.situations[name] = new RaconteurSituation(spec)); -}; - -/* Hack. Needed to ensure a single global "Undum" object. FIXME. */ -module.exports.exportUndum = function () { - if (!global.undum) { - global.undum = undum; - } }; \ No newline at end of file