Fixed wrong weapon drawing and removed old hit code
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user