diff --git a/Enemy.cpp b/Enemy.cpp index 7dc9ac6..c38868b 100644 --- a/Enemy.cpp +++ b/Enemy.cpp @@ -113,7 +113,7 @@ void Enemy::update(float delta) } Player *player = Player::getInstance(); - if(inObject(player->position + player->leftWeapon->collisionPoint)){ +/* if(inObject(player->position + player->leftWeapon->collisionPoint)){ if(!isHit){ isHit = true; hit(player->leftWeapon->damage); @@ -127,5 +127,5 @@ void Enemy::update(float delta) std::cout << "HIT2"; }else{ isHit = false; - } + }*/ } \ No newline at end of file diff --git a/Weapon.cpp b/Weapon.cpp index 118a142..0ff6d43 100644 --- a/Weapon.cpp +++ b/Weapon.cpp @@ -93,8 +93,6 @@ void Weapon::draw(){ glRotatef(rotationWeapon.x, 1, 0, 0); glTranslatef(-ankerPoint.x, -ankerPoint.y, -ankerPoint.z); - glScalef(scale, scale, scale); - weaponmodel->draw(); glPopMatrix();