Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
karnkaul committed Jul 14, 2024
1 parent 00097bc commit b65f1fb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/spaced/spaced/game/player.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Player::Player(Services const& services, std::unique_ptr<IController> controller
if (auto const death = resources.get<ParticleEmitter>("assets/particles/explode.json")) { m_death_source = *death; }
m_death_source.config.respawn = false;

m_heat_color = rgbas["ship_heat"];
m_heat_color = rgbas.get_or("ship_heat", bave::red_v);
}

void Player::on_focus(bave::FocusChange const& /*focus_changed*/) { m_controller->untap(); }
Expand Down
8 changes: 4 additions & 4 deletions src/spaced/spaced/game/player.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ class Player : public IDamageable, public bave::IDrawable {

float m_heat_being_rendered{};
float m_heat{};
float m_heat_increment = 0.1f;
float m_heat_dissipated = 0.4f; // per second
bave::Rgba m_heat_color;
float m_heat_increment{0.1f};
float m_heat_dissipated{0.4f}; // per second
bave::Rgba m_heat_color{};
bool m_is_cooling_down{};
float m_cooldown_threshold = 0.5f;
float m_cooldown_threshold{0.5f};

bave::ParticleEmitter m_death_source{};
std::optional<bave::ParticleEmitter> m_death{};
Expand Down
1 change: 0 additions & 1 deletion src/spaced/spaced/game/weapons/gun_kinetic.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
#include <bave/core/inclusive_range.hpp>
#include <bave/services/audio.hpp>
#include <spaced/game/weapon.hpp>
#include <spaced/game/weapons/projectile.hpp>
Expand Down

0 comments on commit b65f1fb

Please sign in to comment.