Browse Source

Fixed wrong weapon drawing and removed old hit code

jancoow 9 years ago
parent
commit
1da4dedcea
2 changed files with 2 additions and 4 deletions
  1. 2 2
      Enemy.cpp
  2. 0 2
      Weapon.cpp

+ 2 - 2
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;
-	}
+	}*/
 }

+ 0 - 2
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();