X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=f0811de23ede1282543681de19c6996aff6223f2;hb=3aca2860c95bb4d30569a23ab88a5286c3b9b757;hp=05f3d8ad231057619d140110c6f6b42b0cc95abc;hpb=5d1a76ae7725af998c6ee46adfe492c68ee1d34f;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 05f3d8a..f0811de 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,3 +1,4 @@
+#include "keys.h"
 #include "app/Application.h"
 #include "app/Arguments.h"
 #include "app/Input.h"
@@ -14,6 +15,7 @@
 #include "common/Ikari.h"
 #include "common/Inventory.h"
 #include "common/Item.h"
+#include "common/LevelUp.h"
 #include "common/Script.h"
 #include "common/Spell.h"
 #include "common/Stats.h"
@@ -109,6 +111,7 @@ int main(int argc, char **argv) {
 		common::Hero::CreateTypeDescription();
 		common::Ikari::CreateTypeDescription();
 		common::Item::CreateTypeDescription();
+		common::LevelUp::CreateTypeDescription();
 		common::Stats::CreateTypeDescription();
 		common::Spell::CreateTypeDescription();
 		common::TargetingMode::CreateTypeDescription();
@@ -178,7 +181,7 @@ int main(int argc, char **argv) {
 
 		if (intp.PostponedDefinitions().size() > 0) {
 			for (vector<Interpreter::PostponedDefinition>::const_iterator i(intp.PostponedDefinitions().begin()), end(intp.PostponedDefinitions().end()); i != end; ++i) {
-				std::cerr << "missing definition of " << TypeDescription::Get(i->linkedType).TypeName() << " " << i->identifier << std::endl;
+				std::cerr << "missing definition of " << TypeDescription::Get(i->type).TypeName() << " " << i->identifier << std::endl;
 			}
 			return 3;
 		}
@@ -320,22 +323,7 @@ int main(int argc, char **argv) {
 		}
 
 		Application app(screen, state);
-		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
-		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
-		app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
-		app.Buttons().MapKey(SDLK_a, Input::PAD_LEFT);
-		app.Buttons().MapKey(SDLK_RIGHT, Input::ACTION_A);
-		app.Buttons().MapKey(SDLK_DOWN, Input::ACTION_B);
-		app.Buttons().MapKey(SDLK_UP, Input::ACTION_X);
-		app.Buttons().MapKey(SDLK_LEFT, Input::ACTION_Y);
-		app.Buttons().MapKey(SDLK_RETURN, Input::START);
-		app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
-		app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
-		app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
-		app.Buttons().MapKey(SDLK_1, Input::DEBUG_1);
-		app.Buttons().MapKey(SDLK_2, Input::DEBUG_2);
-		app.Buttons().MapKey(SDLK_3, Input::DEBUG_3);
-		app.Buttons().MapKey(SDLK_4, Input::DEBUG_4);
+		MapKeys(app.Buttons());
 		app.Run();
 
 		return 0;