AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CProjectileWeapon: Remove usages of const_cast 

Now that the base Render() function was made non-const, it's trivial to
apply this to the other classes like CProjectileWeapon.
This commit is contained in:
Lioncash 2020-04-09 20:09:12 -04:00
parent a2f7527388
commit 0c1b47faf8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/Weapon/CProjectileWeapon.cpp
View File

@ -201,7 +201,7 @@ void CProjectileWeapon::RenderParticles() const {
x104_->Render(); x104_->Render();
} }
void CProjectileWeapon::AddToRenderer() const { void CProjectileWeapon::AddToRenderer() {
if (xfc_APSMGen) if (xfc_APSMGen)
g_Renderer->AddParticleGen(*xfc_APSMGen); g_Renderer->AddParticleGen(*xfc_APSMGen);
if (x100_APS2Gen) if (x100_APS2Gen)
@ -216,7 +216,7 @@ void CProjectileWeapon::AddToRenderer() const {
g_Renderer->AddParticleGen(*x104_); g_Renderer->AddParticleGen(*x104_);
} }
void CProjectileWeapon::Render() const { void CProjectileWeapon::Render() {
if (xf4_curFrame > xe8_lifetime || !x124_24_active || !x108_model) if (xf4_curFrame > xe8_lifetime || !x124_24_active || !x108_model)
return; return;
@ -227,7 +227,7 @@ void CProjectileWeapon::Render() const {
std::vector<CLight> useLights; std::vector<CLight> useLights;
useLights.push_back(CLight::BuildLocalAmbient({}, xc8_ambientLightColor)); useLights.push_back(CLight::BuildLocalAmbient({}, xc8_ambientLightColor));
const_cast<CModel&>(**x108_model).GetInstance().ActivateLights(useLights); (**x108_model).GetInstance().ActivateLights(useLights);
CModelFlags flags(0, 0, 3, zeus::skWhite); CModelFlags flags(0, 0, 3, zeus::skWhite);
(*x108_model)->Draw(flags); (*x108_model)->Draw(flags);
} }

4
Runtime/Weapon/CProjectileWeapon.hpp
View File

@ -88,8 +88,8 @@ public:
const zeus::CVector3f& target); const zeus::CVector3f& target);
TLockedToken<CWeaponDescription> GetWeaponDescription() const { return x4_weaponDesc; } TLockedToken<CWeaponDescription> GetWeaponDescription() const { return x4_weaponDesc; }
void RenderParticles() const; void RenderParticles() const;
virtual void AddToRenderer() const; virtual void AddToRenderer();
virtual void Render() const; virtual void Render();
bool IsSystemDeletable() const; bool IsSystemDeletable() const;
void UpdateChildParticleSystems(float); void UpdateChildParticleSystems(float);
void UpdatePSTranslationAndOrientation(); void UpdatePSTranslationAndOrientation();