summaryrefslogtreecommitdiff
path: root/server/src/macroparser.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2012-08-23 13:31:57 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2012-08-23 13:31:57 +0200
commit07694570b09524881d01df7c857cc8f471f1ad04 (patch)
tree8cae77df7bb081c1b7d37a587d11c765769d3643 /server/src/macroparser.h
parent05732251c115b3538879ca523c461572115c6526 (diff)
parent909c48a297d7f68b107fce7ad444c2165f749f42 (diff)
Merge branch 'master' of http://git.aasimon.org/public/pracro
Diffstat (limited to 'server/src/macroparser.h')
-rw-r--r--server/src/macroparser.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/server/src/macroparser.h b/server/src/macroparser.h
index 71ef911..ab6fda5 100644
--- a/server/src/macroparser.h
+++ b/server/src/macroparser.h
@@ -42,7 +42,9 @@ class MacroParser : public SAXParser {
MAP,
WIDGETS,
SCRIPTS,
- SCRIPT
+ SCRIPT,
+ COMMIT_SCRIPTS,
+ COMMIT_SCRIPT
} ParserState;
public:
@@ -76,6 +78,7 @@ private:
Map *current_map;
Script *current_script;
Script *current_resume_script;
+ Script *current_commit_script;
std::vector< Widget* > widgetstack;
// Error callback function.