From eef1d8ea60e3797ba261ebfe61a7d1e165069ed4 Mon Sep 17 00:00:00 2001 From: totycro Date: Mon, 4 Apr 2011 22:02:31 +0200 Subject: Use only 1 color format for everything Simple map parsing for Blocks and Bonus points --- pacman-c++/constants.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'pacman-c++/constants.h') diff --git a/pacman-c++/constants.h b/pacman-c++/constants.h index 278f2b3..a8907b1 100644 --- a/pacman-c++/constants.h +++ b/pacman-c++/constants.h @@ -4,20 +4,26 @@ const unsigned int map_size[2] = { 20, 20 }; const unsigned int field_size[2] = { 16, 16 }; +enum Color { + noColor = 0, + red = (1 << 0), + blue = (1 << 1), + green = (1 << 2), +}; + // constants for data transmission to client namespace transmission { typedef unsigned int field_t; - const field_t red = (1 << 0); - const field_t blue = (1 << 1); - const field_t green = (1 << 2); + typedef unsigned int mask_t; - const field_t box = (1 << 3); - const field_t foo = (1 << 4); + const field_t block = (1 << 3); + const field_t bonuspoint = (1 << 4); + + const mask_t color_mask = noColor | red | blue | green; + const mask_t type_mask = block | bonuspoint; typedef field_t** map_t; } - - #endif // CONSTANTS_H \ No newline at end of file -- cgit v1.2.3