2 files changed, 165 insertions, 24 deletions

diff --git a/pacman-c++/constants.h b/pacman-c++/constants.h
index 46791be..e009d40 100644
--- a/pacman-c++/constants.h
+++ b/pacman-c++/constants.h
@@ -6,7 +6,7 @@ namespace Constants {
   {
     const unsigned int width, height;
   } field_size =  { 16, 16 },
-    map_size =    { 20, 20 },
+    map_size =    { 30, 30 },
     map_size_pixel = { field_size.width * map_size.width,
                        field_size.height * map_size.height};
   const unsigned int sprite_margin = 2;
@@ -30,15 +30,15 @@ namespace Transmission
   typedef unsigned int field_t;
   typedef unsigned int mask_t;
 
-  const field_t block =       (1 << 3);
-  const field_t bonuspoint =  (1 << 4);
-  const field_t pacman =      (1 << 5);
+  const field_t block      = (1 << 3);
+  const field_t bonuspoint = (1 << 4);
+  const field_t pacman     = (1 << 5);
 
-  const field_t direction_none =  0;
-  const field_t direction_left =  (1 << 6);
+  const field_t direction_none  = 0;
+  const field_t direction_left  = (1 << 6);
   const field_t direction_right = (1 << 7);
-  const field_t direction_up =    (1 << 8);
-  const field_t direction_down =  (1 << 9);
+  const field_t direction_up    = (1 << 8);
+  const field_t direction_down  = (1 << 9);
 
   const mask_t color_mask = Color::none | Color::red | Color::blue | Color::green;
   const mask_t type_mask = block | bonuspoint;
diff --git a/pacman-c++/mainwidget.cpp b/pacman-c++/mainwidget.cpp
index a3acc45..ad11bf2 100644
--- a/pacman-c++/mainwidget.cpp
+++ b/pacman-c++/mainwidget.cpp
@@ -22,22 +22,157 @@ Transmission::map_t createDummyMap()
     }
   }
 
-  map[0][0] |= Color::none ^ Transmission::block;
-  map[0][1] |= Color::none ^ Transmission::block;
-  map[0][2] |= Color::none ^ Transmission::block;
-  map[0][3] |= Color::none ^ Transmission::block;
-  map[0][4] |= Color::none ^ Transmission::block;
-  map[0][5] |= Color::none ^ Transmission::block;
-  map[1][0] |= Color::none ^ Transmission::block;
-  map[2][0] |= Color::none ^ Transmission::block;
-  map[1][3] |= Color::none ^ Transmission::block;
-  map[2][3] |= Color::none ^ Transmission::block;
-  map[3][3] |= Color::none ^ Transmission::block;
-  map[2][4] |= Color::none ^ Transmission::block;
-  map[2][5] |= Color::none ^ Transmission::block;
-  map[2][2] |= Color::none ^ Transmission::block;
-  map[2][1] |= Color::none ^ Transmission::block;
-
+  // T
+  unsigned x = 0, y = 0;
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 3][y + 0] |= Color::none | Transmission::block;
+  map[x + 4][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 1] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  map[x + 2][y + 3] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  x += 6;
+
+  // U
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 1] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  map[x + 2][y + 3] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  x += 4;
+
+  // :
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  x += 2;
+
+  // W
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  map[x + 3][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 1] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  map[x + 4][y + 0] |= Color::none | Transmission::block;
+  map[x + 4][y + 1] |= Color::none | Transmission::block;
+  map[x + 4][y + 2] |= Color::none | Transmission::block;
+  map[x + 4][y + 3] |= Color::none | Transmission::block;
+  map[x + 4][y + 4] |= Color::none | Transmission::block;
+  x += 6;
+
+  // I
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  x += 2;
+
+  // E
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 2] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  map[x + 1][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  x += 4;
+
+  // N
+  map[x + 0][y + 0] |= Color::none ^ Transmission::block;
+  map[x + 0][y + 1] |= Color::none ^ Transmission::block;
+  map[x + 0][y + 2] |= Color::none ^ Transmission::block;
+  map[x + 0][y + 3] |= Color::none ^ Transmission::block;
+  map[x + 0][y + 4] |= Color::none ^ Transmission::block;
+  map[x + 1][y + 1] |= Color::none ^ Transmission::block;
+  map[x + 2][y + 2] |= Color::none ^ Transmission::block;
+  map[x + 3][y + 3] |= Color::none ^ Transmission::block;
+  map[x + 4][y + 0] |= Color::none ^ Transmission::block;
+  map[x + 4][y + 1] |= Color::none ^ Transmission::block;
+  map[x + 4][y + 2] |= Color::none ^ Transmission::block;
+  map[x + 4][y + 3] |= Color::none ^ Transmission::block;
+  map[x + 4][y + 4] |= Color::none ^ Transmission::block;
+
+  // F
+  x = 5;
+  y = 6;
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 2] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  x += 4;
+
+  // O
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  map[x + 3][y + 0] |= Color::none | Transmission::block;
+  map[x + 3][y + 1] |= Color::none | Transmission::block;
+  map[x + 3][y + 2] |= Color::none | Transmission::block;
+  map[x + 3][y + 3] |= Color::none | Transmission::block;
+  map[x + 3][y + 4] |= Color::none | Transmission::block;
+  x += 5;
+
+  // O
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 4] |= Color::none | Transmission::block;
+  map[x + 2][y + 4] |= Color::none | Transmission::block;
+  map[x + 3][y + 0] |= Color::none | Transmission::block;
+  map[x + 3][y + 1] |= Color::none | Transmission::block;
+  map[x + 3][y + 2] |= Color::none | Transmission::block;
+  map[x + 3][y + 3] |= Color::none | Transmission::block;
+  map[x + 3][y + 4] |= Color::none | Transmission::block;
+  x += 5;
+
+  // P
+  map[x + 0][y + 0] |= Color::none | Transmission::block;
+  map[x + 0][y + 1] |= Color::none | Transmission::block;
+  map[x + 0][y + 2] |= Color::none | Transmission::block;
+  map[x + 0][y + 3] |= Color::none | Transmission::block;
+  map[x + 0][y + 4] |= Color::none | Transmission::block;
+  map[x + 1][y + 0] |= Color::none | Transmission::block;
+  map[x + 2][y + 0] |= Color::none | Transmission::block;
+  map[x + 1][y + 2] |= Color::none | Transmission::block;
+  map[x + 2][y + 2] |= Color::none | Transmission::block;
+  map[x + 3][y + 0] |= Color::none | Transmission::block;
+  map[x + 3][y + 1] |= Color::none | Transmission::block;
+  map[x + 3][y + 2] |= Color::none | Transmission::block;
+  x += 5;
+
+  /*
   map[4][3] |= Color::green ^ Transmission::block;
 
   map[5][3] |= Color::none ^ Transmission::block;
@@ -49,6 +184,12 @@ Transmission::map_t createDummyMap()
   map[5][5] |= Color::blue;
   map[5][5] |= Transmission::pacman;
   map[5][5] |= Transmission::direction_left;
+  
+  map[7][5] |= Transmission::bonuspoint;*/
+  
+  map[15][15] |= Color::blue;
+  map[15][15] |= Transmission::pacman;
+  map[15][15] |= Transmission::direction_left;
 
   return map;
 }