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, 1 insertions, 1 deletions

diff --git a/pacman-c++/block.cpp b/pacman-c++/block.cpp
index 9e5e427..7cb77cc 100644
--- a/pacman-c++/block.cpp
+++ b/pacman-c++/block.cpp
@@ -19,5 +19,5 @@ Block::Block(Color::Color color, unsigned int neighbours, QGraphicsItem *parent)
 
 void Block::setNeighbours(unsigned int neighbours)
 {
-  setSprite(neighbours * SPRITE_OFFSET, 0, SPRITE_WIDTH, SPRITE_HEIGHT);
+  setSprite(neighbours * Constants::sprite_offset, 0, Constants::field_size.width, Constants::field_size.height);
 }