diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2011-12-29 23:30:49 -0700 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2011-12-29 23:30:49 -0700 |
| commit | 35f71b12dc48a928d98743f607f62b2f6dbe7307 (patch) | |
| tree | f4297f57e570f52f3776392fc8ed4075db1ab4ac /src/gamestate.h | |
| parent | f66458278ce3663397fc985a1253c85b74f011e6 (diff) | |
| download | stage-35f71b12dc48a928d98743f607f62b2f6dbe7307.tar.gz stage-35f71b12dc48a928d98743f607f62b2f6dbe7307.tar.bz2 stage-35f71b12dc48a928d98743f607f62b2f6dbe7307.tar.xz stage-35f71b12dc48a928d98743f607f62b2f6dbe7307.zip | |
Goto works, scopes work.
Diffstat (limited to 'src/gamestate.h')
| -rw-r--r-- | src/gamestate.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gamestate.h b/src/gamestate.h index 83d8594..6000419 100644 --- a/src/gamestate.h +++ b/src/gamestate.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include "astbranch.h" | 4 | #include "astbranch.h" |
| 5 | #include "variable.h" | 5 | #include "variable.h" |
| 6 | #include "scope.h" | 6 | #include "scope.h" |
| 7 | #include "enums.h" | ||
| 7 | 8 | ||
| 8 | class Game; | 9 | class Game; |
| 9 | 10 | ||
| @@ -25,14 +26,6 @@ public: | |||
| 25 | 26 | ||
| 26 | void callFunction( const Bu::String &sName ); | 27 | void callFunction( const Bu::String &sName ); |
| 27 | 28 | ||
| 28 | enum ScopeId | ||
| 29 | { | ||
| 30 | sidLocal, | ||
| 31 | sidGlobal, | ||
| 32 | sidPlayer, | ||
| 33 | sidSituation | ||
| 34 | }; | ||
| 35 | |||
| 36 | Variable getVariable( const Bu::String &sName, ScopeId id=sidLocal ); | 29 | Variable getVariable( const Bu::String &sName, ScopeId id=sidLocal ); |
| 37 | void setVariable( const Bu::String &sName, const Variable &v, ScopeId id=sidLocal ); | 30 | void setVariable( const Bu::String &sName, const Variable &v, ScopeId id=sidLocal ); |
| 38 | 31 | ||
| @@ -51,6 +44,8 @@ private: | |||
| 51 | ScopeHash hsSituation; | 44 | ScopeHash hsSituation; |
| 52 | Bu::String sCurSituation; | 45 | Bu::String sCurSituation; |
| 53 | 46 | ||
| 47 | bool bEscape; | ||
| 48 | |||
| 54 | VariableList lStack; | 49 | VariableList lStack; |
| 55 | }; | 50 | }; |
| 56 | 51 | ||
