summaryrefslogtreecommitdiff
path: root/server/src/macroparser.h
diff options
context:
space:
mode:
authordeva <deva>2008-07-30 12:58:13 +0000
committerdeva <deva>2008-07-30 12:58:13 +0000
commit6c9a544e63e73c8aa3e990e9370ca9c582612f49 (patch)
tree76c2cdd65500116dc5b1539ef1baa0eedeacc01f /server/src/macroparser.h
parent0da554ba6a55bbc195a30afa8f154af2ec2107a7 (diff)
Reenabled support for upload server. Currently only tested against local print-to-screen version.
Diffstat (limited to 'server/src/macroparser.h')
-rw-r--r--server/src/macroparser.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/server/src/macroparser.h b/server/src/macroparser.h
index 0b755f0..cbd36ba 100644
--- a/server/src/macroparser.h
+++ b/server/src/macroparser.h
@@ -39,8 +39,8 @@ class MacroParser : public SAXParser {
MAPS,
MAP,
WINDOW,
- LUAPROGRAMS,
- LUAPROGRAM
+ SCRIPTS,
+ SCRIPT
} ParserState;
public:
@@ -66,7 +66,7 @@ private:
ParserState state;
Macro *m;
Map *current_map;
- LUAProgram *current_luaprogram;
+ Script *current_script;
std::vector< Widget* > widgetstack;
// Error callback function.