Added controller cursor in menu

2016-06-21 22:12:08 +02:00
parent 0431e9c230
commit e7163fc07c
10 changed files with 202 additions and 30 deletions
@@ -133,16 +133,19 @@ void Enemy::update(float delta)
 		rotation.y = atan2f(dx, dz) * 180 / M_PI;		
 	}
 	Player *player = Player::getInstance();
-	if(inObject(player->leftWeapon->collisionPoint)){
+
+	if(inObject(player->position + player->leftWeapon->collisionPoint)){
 		if(!isHit){
 			isHit = true;
 			hit(player->leftWeapon->damage);
 		}
+		std::cout << "HIT1";
 	}else if(inObject(player->rightWeapon->collisionPoint)){
 		if(!isHit){
 			isHit = true;
 			hit(player->rightWeapon->damage);
 		}
+		std::cout << "HIT2";
 	}else{
 		isHit = false;
 	}