map start

Nikita-str · Feb 19, 2021 · bc246af · bc246af
1 parent 415f30e
commit bc246af
Show file tree

Hide file tree

Showing 6 changed files with 84 additions and 2 deletions.
diff --git a/GameMap.cpp b/GameMap.cpp
diff --git a/GameMap.h b/GameMap.h
@@ -0,0 +1,5 @@
+#ifndef MAIN_Gmap_H
+#define MAIN_Gmap_H
+
+
+#endif
diff --git a/LiveObjSprite.h b/LiveObjSprite.h
@@ -33,7 +33,7 @@ struct LiveObjSprite
             }
         }
 
-        cur_spr = &spr_states.find(cur_state)->second.find(cur_dir)->second;
+        SetCurSprite();
     }
 
     bool SetDir(E_Dir new_dir)
@@ -66,10 +66,18 @@ struct LiveObjSprite
 private:
     void SpritePrepare()
     {
-        cur_spr = &spr_states.find(cur_state)->second.find(cur_dir)->second;
+        SetCurSprite();
         cur_spr->Restart();
     }
 
+    inline void SetCurSprite()
+    {
+        cur_spr = &spr_states.find(cur_state)->second.find(cur_dir)->second;
+        if (cur_spr == nullptr) {
+            cur_spr = &spr_states.find(E_LiveObjState::Idle)->second.find(cur_dir)->second;
+        }
+    }
+
     std::map< E_LiveObjState, std::map<E_Dir, Sprite>> spr_states;
     E_Dir cur_dir = E_Dir::DOWN;
     E_LiveObjState cur_state = E_LiveObjState::Idle;

diff --git a/maps/A.txt b/maps/A.txt
@@ -0,0 +1,30 @@
+z+
+#############.####################
+#C.E...#.........#...............#
+#......#.........#........E......#
+#......#.........#...............#
+#E.E...#.........#...............#
+##.######.#####.####.##..........#
+#...........#.........#..........#
+#...........#.........#####.######
+#...........#.........#..........#
+#...........#.........#..........#
+O....E......#.........#...........
+####...###########.####..........#
+#.........#...........#..........#
+#.........#...........#..........#
+#...G............E....#...E...E..#
+#.........#...........#..........#
+#.........#...........#.....K....#
+###########.######################
+z-
+
+E: 1, 0, 1, 1, 1, 0, 0, 0
+
+/E: - type of enemies in the same order as they stay on map
+
+/O is openable door  (you need a key)
+/z+ map begin
+/z- map end
+
+/C is chest
diff --git a/maps/F.txt b/maps/F.txt
@@ -0,0 +1,33 @@
+z+
+####################.####################
+#.................#...#.................#
+#.................#...#.................#
+#....G............#...#.................#
+#.................#...#.................#
+#.................#.....................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#...............###...###...............#
+##.##############.......#################
+#.......................................O
+##.##############.......#################
+#...............###...###...............#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+#.................#.....................#
+#...G.............#...#.................#
+#.................#...#.................#
+#.................#...#.................#
+####################.####################
+z-
diff --git a/maps/M_OF_M.txt b/maps/M_OF_M.txt
@@ -0,0 +1,6 @@
+AAAAA
+AAAAA
+AAFAA
+AAAAA
+AAAAA
+
-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    AAAAA
+    AAAAA
+    AAFAA
+    AAAAA
+    AAAAA