diff --git a/ShooterClient.cpp b/ShooterClient.cpp index a444683..32e09c1 100644 --- a/ShooterClient.cpp +++ b/ShooterClient.cpp @@ -150,7 +150,8 @@ void ShooterClient::processCustomPacket(sf::Packet &packet) { camera->rotateLeft(-camera->angleLeftUpLookAt().x()); camera->transform(Matrix4x4::Rotation(-_player->angle())); - Timeline::animate(AnimationListTag("camera_anim"), std::make_shared(camera, Vec3D(-20, 30, -100))); + Timeline::animate(AnimationListTag("camera_anim"), std::make_shared(camera, Vec3D(0, 30, -100))); + Timeline::animate(AnimationListTag("camera_anim"), std::make_shared(0)); Timeline::animate(AnimationListTag("camera_anim"), std::make_shared(camera, Vec3D(0), Vec3D{0, Consts::PI, 0}, 5, Animation::LoopOut::None, Animation::InterpolationType::Linear)); Timeline::animate(AnimationListTag("camera_anim"), std::make_shared(0)); Timeline::animate(AnimationListTag("camera_anim"), std::make_shared([this, camera](){ diff --git a/weapon/Weapon.cpp b/weapon/Weapon.cpp index 7fe52d6..9357bd3 100644 --- a/weapon/Weapon.cpp +++ b/weapon/Weapon.cpp @@ -72,7 +72,7 @@ void Weapon::reload() { Log::log("Weapon::reload (" + std::to_string(_stockAmmo) + " : " + std::to_string(_clipAmmo) + ")"); _lastReloadTime = Time::time(); - if(_reloadCallBack != nullptr) { + if (_reloadCallBack != nullptr) { _reloadCallBack(); } } @@ -99,11 +99,22 @@ Weapon::addTrace(std::function