2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-15 16:06:10 +00:00

Merge remote-tracking branch 'origin/master' into omegapirate

This commit is contained in:
2020-04-09 20:06:33 -04:00
157 changed files with 707 additions and 530 deletions

View File

@@ -117,7 +117,7 @@ void CGrenadeLauncher::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid,
}
}
void CGrenadeLauncher::AddToRenderer(const zeus::CFrustum& frustum, const CStateManager& mgr) const {
void CGrenadeLauncher::AddToRenderer(const zeus::CFrustum& frustum, CStateManager& mgr) {
CActor::AddToRenderer(frustum, mgr);
}
@@ -137,7 +137,7 @@ void CGrenadeLauncher::PreRender(CStateManager& mgr, const zeus::CFrustum& frust
CActor::PreRender(mgr, frustum);
}
void CGrenadeLauncher::Render(const CStateManager& mgr) const {
void CGrenadeLauncher::Render(CStateManager& mgr) {
if (x3fd_visible) {
CPhysicsActor::Render(mgr);
}