mirror of
https://github.com/Oreolek/undum.git
synced 2024-05-04 01:59:21 +03:00
Merge pull request #31 from Oreolek/enter
Call SimpleSituation.enter before main content
This commit is contained in:
commit
32733856ec
|
@ -310,6 +310,7 @@
|
|||
system.writeHeading(this.heading);
|
||||
}
|
||||
}
|
||||
if (this._enter) this._enter(character, system, from);
|
||||
if (this.content) {
|
||||
if ($.isFunction(this.content)) {
|
||||
system.write(this.content());
|
||||
|
@ -323,7 +324,6 @@
|
|||
this.maxChoices);
|
||||
system.writeChoices(choices);
|
||||
}
|
||||
if (this._enter) this._enter(character, system, from);
|
||||
};
|
||||
SimpleSituation.prototype.act = function(character, system, action) {
|
||||
var response = this.actions[action];
|
||||
|
|
Loading…
Reference in a new issue