some minor cleanup

1 files changed, 10 insertions, 7 deletions

diff --git a/pacman-c++/constants.h b/pacman-c++/constants.h
index 56d29b7..15d3022 100644
--- a/pacman-c++/constants.h
+++ b/pacman-c++/constants.h
@@ -8,13 +8,16 @@
 const unsigned int map_size[2] = { 20, 20 };
 const unsigned int field_size[2] = { 16, 16 };
 
-enum Color
+namespace Color
 {
-  noColor =   0,
-  red =       (1 << 0),
-  blue =      (1 << 1),
-  green =     (1 << 2),
-};
+  enum Color
+  {
+    none  = 0,
+    red   = (1 << 0),
+    blue  = (1 << 1),
+    green = (1 << 2),
+  };
+}
   
 // constants for data transmission to client
 namespace transmission
@@ -32,7 +35,7 @@ namespace transmission
   const field_t direction_up =    (1 << 8);
   const field_t direction_down =  (1 << 9);
 
-  const mask_t color_mask = noColor | red | blue | green;
+  const mask_t color_mask = Color::none | Color::red | Color::blue | Color::green;
   const mask_t type_mask = block | bonuspoint;
   const mask_t direction_mask = direction_none | direction_left | direction_right | direction_up | direction_down;