!!!!!!!!!!!
This commit is contained in:
parent
6076b55267
commit
40e90fe12d
@ -184,11 +184,14 @@ Player::Sound Player::ApplyPhysics(Vector3f input, World* world, float elapsedTi
|
|||||||
else isStep = false;
|
else isStep = false;
|
||||||
m_POV = m_position.y;
|
m_POV = m_position.y;
|
||||||
m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f;
|
m_POV += m_airborne ? 0 : (sin(bobbingtime) - 0.5f) * (abs(m_velocity.x) + abs(m_velocity.z)) * .2f;
|
||||||
// TakeBooster(booster_table, elapsedTime);
|
|
||||||
RemoveBooster(elapsedTime);
|
RemoveBooster(elapsedTime);
|
||||||
return snd;
|
return snd;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Player::Put(Vector3f pos) {
|
||||||
|
m_position = pos;
|
||||||
|
}
|
||||||
|
|
||||||
void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
|
void Player::ApplyTransformation(Transformation& transformation, bool rel, bool rot) const {
|
||||||
|
|
||||||
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
|
transformation.ApplyRotation(-m_rotX, 1, 0, 0);
|
||||||
|
@ -58,6 +58,8 @@ public:
|
|||||||
bool boostdamage = false;
|
bool boostdamage = false;
|
||||||
bool boostinvincible = false;
|
bool boostinvincible = false;
|
||||||
|
|
||||||
|
void Put(Vector3f pos);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
uint64_t getId() const;
|
uint64_t getId() const;
|
||||||
|
|
||||||
|
@ -1913,8 +1913,7 @@ void Engine::KeyReleaseEvent(unsigned char key) {
|
|||||||
m_keyS = false;
|
m_keyS = false;
|
||||||
break;
|
break;
|
||||||
case 19: // T -Reset countdown
|
case 19: // T -Reset countdown
|
||||||
m_resetcountdown = true;
|
m_player.Put(m_otherplayerpos);
|
||||||
std::cout << "RESET COUNTDOWN" << std::endl;
|
|
||||||
break;
|
break;
|
||||||
case 22: // W - Stop avancer
|
case 22: // W - Stop avancer
|
||||||
m_keyW = false;
|
m_keyW = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user