Merge branch 'master' of ssh://manuel.mausz.at/foop

Conflicts:
	pacman-c++/actor.cpp
	pacman-c++/constants.h
	pacman-c++/mainwidget.cpp

1 files changed, 14 insertions, 10 deletions

diff --git a/pacman-c++/constants.h b/pacman-c++/constants.h
index 33f235a..46791be 100644
--- a/pacman-c++/constants.h
+++ b/pacman-c++/constants.h
@@ -1,13 +1,17 @@
 #ifndef CONSTANTS_H
 #define CONSTANTS_H
 
-#define SPRITE_MARGIN 2
-#define SPRITE_WIDTH  16
-#define SPRITE_HEIGHT 16
-#define SPRITE_OFFSET 20
-
-const unsigned int map_size[2] = { 20, 20 };
-const unsigned int field_size[2] = { 16, 16 };
+namespace Constants {
+  const struct
+  {
+    const unsigned int width, height;
+  } field_size =  { 16, 16 },
+    map_size =    { 20, 20 },
+    map_size_pixel = { field_size.width * map_size.width,
+                       field_size.height * map_size.height};
+  const unsigned int sprite_margin = 2;
+  const unsigned int sprite_offset = 20;
+}
 
 namespace Color
 {
@@ -19,13 +23,13 @@ namespace Color
     green = (1 << 2),
   };
 }
-  
+
 // constants for data transmission to client
-namespace transmission
+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);