renamed namespace geometry -> math

[l2e.git] / src / loader / Interpreter.h

diff --git a/src/loader/Interpreter.h b/src/loader/Interpreter.h
index 5fbded6a0dc4d324971c6d9fea5d5938db1376fd..5707959e49265d52b66ecd075ac64d569b7dc44c 100644 (file)
--- a/src/loader/Interpreter.h
+++ b/src/loader/Interpreter.h
@@ -1,10 +1,3 @@
-/*
- * Interpreter.h
- *
- *  Created on: Aug 26, 2012
- *      Author: holy
- */
-
 #ifndef LOADER_INTERPRETER_H_
 #define LOADER_INTERPRETER_H_
 
@@ -14,7 +7,8 @@
 #include "TypeDescription.h"
 #include "../battle/fwd.h"
 #include "../common/fwd.h"
-#include "../geometry/Vector.h"
+#include "../common/Script.h"
+#include "../math/Vector.h"
 #include "../graphics/Color.h"
 #include "../graphics/ComplexAnimation.h"
 #include "../graphics/fwd.h"
@@ -31,6 +25,15 @@ namespace loader {
 class Interpreter {
 
 public:
+       static const int BOOLEAN_ID = 1;
+       static const int COLOR_ID = 2;
+       static const int IMAGE_ID = 3;
+       static const int NUMBER_ID = 4;
+       static const int PATH_ID = 5;
+       static const int SCRIPT_ID = 6;
+       static const int STRING_ID = 7;
+       static const int VECTOR_ID = 8;
+
        class Error: public std::runtime_error {
        public:
                Error(const std::string &msg) : std::runtime_error("interpreter error: " + msg) { }
@@ -67,7 +70,7 @@ public:
        };
 
        const std::set<std::string> &ExportedIdentifiers() const { return source.Exports(); }
-       const ParsedDefinition &GetDefinition(const std::string &identifier) const;
+       const ParsedDefinition &GetDefinition(const std::string &identifier);
        const std::map<std::string, SDL_Surface *> &Images() const { return imageCache; }
        const std::vector<PostponedDefinition> &PostponedDefinitions() const { return postponedDefinitions; }
        const std::map<int, std::vector<void *> > &Values() const { return values; }
@@ -82,9 +85,10 @@ private:
        void ReadObject(int typeId, int id, char *dest, const PropertyList &);
        void ReadScript(const std::vector<ScriptToken *> &, common::Script *);
        char *ReadScript(const std::vector<ScriptToken *> &);
-       void ReadScriptAddress(const ScriptToken &t, unsigned char *dest);
-       void ReadScriptInteger(const ScriptToken &t, unsigned char *dest);
-       void ReadScriptVector(const ScriptToken &t, unsigned char *dest);
+       common::Script::Code &CreateScriptCode(common::Script::Command c, char *dest);
+       void ReadScriptAddress(const ScriptToken &t, char *dest);
+       void ReadScriptInteger(const ScriptToken &t, char *dest);
+       void ReadScriptVector(const ScriptToken &t, char *dest);
 
        SDL_Surface *GetImage(const std::string &);