diff --git a/src/assets/AssetManager.h b/src/assets/AssetManager.h index 09e02275..ae4b693d 100644 --- a/src/assets/AssetManager.h +++ b/src/assets/AssetManager.h @@ -329,15 +329,15 @@ class AssetManager { template static void ReviewPriorities(AssetCache &cache); - /** @copydoc */ + /** @copydoc AssetManager::ReviewPriorities */ template <> void ReviewPriorities(AssetCache &cache); - /** @copydoc */ + /** @copydoc AssetManager::ReviewPriorities */ template <> void ReviewPriorities(AssetCache &cache); - /** @copydoc */ + /** @copydoc AssetManager::ReviewPriorities */ template <> void ReviewPriorities(AssetCache &cache); }; diff --git a/src/game/CAbstractPlayer.cpp b/src/game/CAbstractPlayer.cpp index 7432498b..96efabfe 100644 --- a/src/game/CAbstractPlayer.cpp +++ b/src/game/CAbstractPlayer.cpp @@ -463,15 +463,9 @@ void CAbstractPlayer::PlaceHUDParts() { } else { mt = &viewPortPart->itsTransform; - if (debug2Flag) { - theHit.direction[0] = FMul((*mt)[2][0], PLAYERMISSILESPEED) + speed[0]; - theHit.direction[1] = FMul((*mt)[2][1], PLAYERMISSILESPEED) + speed[1]; - theHit.direction[2] = FMul((*mt)[2][2], PLAYERMISSILESPEED) + speed[2]; - } else { - theHit.direction[0] = FMul((*mt)[2][0], PLAYERMISSILESPEED); - theHit.direction[1] = FMul((*mt)[2][1], PLAYERMISSILESPEED); - theHit.direction[2] = FMul((*mt)[2][2], PLAYERMISSILESPEED); - } + theHit.direction[0] = FMul((*mt)[2][0], PLAYERMISSILESPEED) + speed[0]; + theHit.direction[1] = FMul((*mt)[2][1], PLAYERMISSILESPEED) + speed[1]; + theHit.direction[2] = FMul((*mt)[2][2], PLAYERMISSILESPEED) + speed[2]; theHit.direction[3] = 0; NormalizeVector(3, theHit.direction); @@ -1696,15 +1690,9 @@ void CAbstractPlayer::GunActions() { CombineTransforms(&m1, &m2, &viewPortPart->itsTransform); MTranslate(speed[0], speed[1], speed[2], &m2); - if (debug2Flag) { - theHit.direction[0] = FMul(m2[2][0], PLAYERMISSILESPEED) + speed[0]; - theHit.direction[1] = FMul(m2[2][1], PLAYERMISSILESPEED) + speed[1]; - theHit.direction[2] = FMul(m2[2][2], PLAYERMISSILESPEED) + speed[2]; - } else { - theHit.direction[0] = FMul(m2[2][0], PLAYERMISSILESPEED); - theHit.direction[1] = FMul(m2[2][1], PLAYERMISSILESPEED); - theHit.direction[2] = FMul(m2[2][2], PLAYERMISSILESPEED); - } + theHit.direction[0] = FMul(m2[2][0], PLAYERMISSILESPEED) + speed[0]; + theHit.direction[1] = FMul(m2[2][1], PLAYERMISSILESPEED) + speed[1]; + theHit.direction[2] = FMul(m2[2][2], PLAYERMISSILESPEED) + speed[2]; missileSpeed[0] = theHit.direction[0]; missileSpeed[1] = theHit.direction[1];