X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=780b8c27b70c85e004d77d45e0a1a3b6e8358971;hb=5ef75aee810e5a687fae24e3f95886241e36efda;hp=0fce8fe511640d4e9f3fdb7fa9feceaa224e7e1a;hpb=e411b1bbef7bc5bc383046e7bf294d2c5a17ac7e;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 0fce8fe..780b8c2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -5,6 +5,42 @@
  *      Author: holy
  */
 
+#include "app/Application.h"
+#include "battle/BattleState.h"
+#include "sdl/InitScreen.h"
+#include "sdl/InitSDL.h"
+
+#include <exception>
+#include <iostream>
+
+using app::Application;
+using battle::BattleState;
+using sdl::InitScreen;
+using sdl::InitSDL;
+
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::exception;
+
 int main(int argc, char **argv) {
-	return 0;
+	const int width = 800;
+	const int height = 480;
+
+	// temporary
+	SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
+	SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0, 0, 0));
+
+	try {
+		InitSDL sdl;
+		InitScreen screen(width, height);
+
+		Application app(screen.Screen(), new BattleState(bg));
+		app.Run();
+
+		return 0;
+	} catch (exception &e) {
+		cerr << "exception in main(): " << e.what() << endl;
+		return 1;
+	}
 }