added application state for map

[l2e.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 965da00e56eb871bd7e5345dd101c40668cf81ad..a2cdae9da96f38112252ece108446c12c9153dc4 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -84,6 +84,8 @@ int main(int argc, char **argv) {
        const int width = 800;
        const int height = 480;
 
+       const bool battle(false);
+
 //     std::srand(std::time(0));
 
        try {
@@ -224,29 +226,33 @@ int main(int argc, char **argv) {
 
                InitScreen screen(width, height);
 
-               BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddMonster(monster);
-               battleState->AddHero(maxim);
-               battleState->AddHero(selan);
-               battleState->AddHero(guy);
-               battleState->AddHero(dekar);
-               Application app(&screen, battleState);
-               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.Run();
+               if (battle) {
+                       BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, battleRes));
+                       battleState->AddMonster(monster);
+                       battleState->AddMonster(monster);
+                       battleState->AddMonster(monster);
+                       battleState->AddMonster(monster);
+                       battleState->AddHero(maxim);
+                       battleState->AddHero(selan);
+                       battleState->AddHero(guy);
+                       battleState->AddHero(dekar);
+                       Application app(&screen, battleState);
+                       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.Run();
+               } else {
+
+               }
 
                return 0;
        } catch (Parser::Error &e) {