X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Floader%2FInterpreter.cpp;h=372a114b8fb26fd83d63493b26099bbc6eef0c85;hb=1aa61eca26f5b4a4cb856a39e802f5899548b691;hp=79fe4f3de31454afcef6ae8b4508f782f56739e7;hpb=795bcbebfc3a63f374f8da0790af5b7105adb68a;p=l2e.git

diff --git a/src/loader/Interpreter.cpp b/src/loader/Interpreter.cpp
index 79fe4f3..372a114 100644
--- a/src/loader/Interpreter.cpp
+++ b/src/loader/Interpreter.cpp
@@ -19,6 +19,7 @@
 #include "../graphics/Font.h"
 #include "../graphics/Frame.h"
 #include "../graphics/Gauge.h"
+#include "../graphics/Menu.h"
 #include "../graphics/SimpleAnimation.h"
 #include "../graphics/Sprite.h"
 
@@ -76,6 +77,9 @@ Interpreter::~Interpreter() {
 	for (vector<Item *>::const_iterator i(items.begin()), end(items.end()); i != end; ++i) {
 		delete *i;
 	}
+	for (vector<graphics::MenuProperties *>::const_iterator i(menuProperties.begin()), end(menuProperties.end()); i != end; ++i) {
+		delete *i;
+	}
 	for (vector<Monster *>::const_iterator i(monsters.begin()), end(monsters.end()); i != end; ++i) {
 		delete *i;
 	}
@@ -219,6 +223,19 @@ Item *Interpreter::GetItem(const std::string &name) {
 	}
 }
 
+graphics::MenuProperties *Interpreter::GetMenuProperties(const std::string &name) {
+	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
+	if (i != parsedDefinitions.end()) {
+		if (i->second.type == MENU_PROPERTIES) {
+			return menuProperties[i->second.index];
+		} else {
+			throw Error("cannot cast " + i->second.dfn->TypeName() + " to MenuProperties");
+		}
+	} else {
+		throw Error("access to undefined MenuProperties " + name);
+	}
+}
+
 Monster *Interpreter::GetMonster(const std::string &name) {
 	map<string, ParsedDefinition>::const_iterator i(parsedDefinitions.find(name));
 	if (i != parsedDefinitions.end()) {
@@ -521,6 +538,28 @@ Item *Interpreter::GetItem(const Value &v) {
 	}
 }
 
+graphics::MenuProperties *Interpreter::GetMenuProperties(const Value &v) {
+	if (v.IsLiteral()) {
+		graphics::MenuProperties *m(new graphics::MenuProperties);
+		ReadMenuProperties(*m, *v.GetLiteral().GetProperties());
+		return m;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetMenuProperties(v.GetIdentifier());
+	}
+}
+
+Monster *Interpreter::GetMonster(const Value &v) {
+	if (v.IsLiteral()) {
+		Monster *m(new Monster);
+		ReadMonster(*m, *v.GetLiteral().GetProperties());
+		return m;
+	} else {
+		ReadDefinition(source.GetDefinition(v.GetIdentifier()));
+		return GetMonster(v.GetIdentifier());
+	}
+}
+
 int Interpreter::GetNumber(const Value &v) {
 	if (v.IsLiteral()) {
 		return v.GetLiteral().GetNumber();
@@ -669,6 +708,12 @@ void Interpreter::ReadObject(const Definition &dfn) {
 		items.push_back(item);
 		ReadItem(*item, *dfn.GetProperties());
 		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, ITEM, index)));
+	} else if (dfn.TypeName() == "MenuProperties") {
+		graphics::MenuProperties *mprops(new graphics::MenuProperties);
+		int index(menuProperties.size());
+		menuProperties.push_back(mprops);
+		ReadMenuProperties(*mprops, *dfn.GetProperties());
+		parsedDefinitions.insert(make_pair(dfn.Identifier(), ParsedDefinition(&dfn, MENU_PROPERTIES, index)));
 	} else if (dfn.TypeName() == "Monster") {
 		Monster *monster(new Monster);
 		int index(monsters.size());
@@ -876,6 +921,40 @@ void Interpreter::ReadHero(Hero &h, const PropertyList &props) {
 	}
 }
 
+void Interpreter::ReadMenuProperties(graphics::MenuProperties &mprops, const PropertyList &props) {
+	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
+		if (i->first == "font") {
+			mprops.font = GetFont(*i->second);
+		} else if (i->first == "disabledFont") {
+			mprops.disabledFont = GetFont(*i->second);
+		} else if (i->first == "cursor") {
+			mprops.cursor = GetSprite(*i->second);
+		} else if (i->first == "charsPerEntry") {
+			mprops.charsPerEntry = GetNumber(*i->second);
+		} else if (i->first == "rows") {
+			mprops.rows = GetNumber(*i->second);
+		} else if (i->first == "rowGap") {
+			mprops.rowGap = GetNumber(*i->second);
+		} else if (i->first == "iconSpace") {
+			mprops.iconSpace = GetNumber(*i->second);
+		} else if (i->first == "cols") {
+			mprops.cols = GetNumber(*i->second);
+		} else if (i->first == "colGap") {
+			mprops.colGap = GetNumber(*i->second);
+		} else if (i->first == "delimiter") {
+			mprops.delimiter = *GetString(*i->second);
+		} else if (i->first == "charsPerNumber") {
+			mprops.charsPerNumber = GetNumber(*i->second);
+		} else if (i->first == "charsPerAdditionalText") {
+			mprops.charsPerAdditionalText = GetNumber(*i->second);
+		} else if (i->first == "additionalTextGap") {
+			mprops.additionalTextGap = GetNumber(*i->second);
+		} else {
+			throw Error("unknown MenuProperties property: " + i->first);
+		}
+	}
+}
+
 void Interpreter::ReadMonster(Monster &m, const PropertyList &props) {
 	for (PropertyList::ConstIterator i(props.Begin()), end(props.End()); i != end; ++i) {
 		if (i->first == "name") {