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++/bonuspoint.cpp b/pacman-c++/bonuspoint.cpp
index 8ebc195..0517c64 100644
--- a/pacman-c++/bonuspoint.cpp
+++ b/pacman-c++/bonuspoint.cpp
@@ -17,5 +17,5 @@ BonusPoint::BonusPoint(QGraphicsItem *parent)
   setPixmap(*pixmap);
 
   int rand = (int) (BONUSPOINTS_NUM_SPRITES * (qrand() / (RAND_MAX + 1.0)));
-  setSprite(rand * 20 + SPRITE_MARGIN, SPRITE_MARGIN, SPRITE_WIDTH, SPRITE_HEIGHT);
+  setSprite(rand * 20 + Constants::sprite_margin, Constants::sprite_margin, Constants::field_size.width, Constants::field_size.height);
 }