Final touchups

Author: Pirulax

source/game_sa/Audio/entities/AECollisionAudioEntity.cpp

@@ -624,11 +624,12 @@ eSoundID CAECollisionAudioEntity::ChooseCollisionSoundID(eSurfaceType surface) {
     if (l->MinSoundID == l->MaxSoundID) {
         return l->MinSoundID;
     }
-    while (true) {
+    for (auto retry = 0; retry < 100; retry++) { // NOTSA: Handle very unlikely infinite loop
         const auto soundID = CAEAudioUtility::GetRandomNumberInRange(l->MinSoundID, l->MaxSoundID);
         if (soundID != m_CollisionSoundIDHistory[surface]) {
             return soundID;
         }
     }
-    NOTSA_UNREACHABLE();
+    NOTSA_LOG_WARN("Failed to generate collision sound ID not in history!"); // NOTSA
+    return l->MinSoundID; // NOTSA
 }

source/game_sa/Audio/entities/AECollisionAudioEntity.h

@@ -76,7 +76,7 @@ class NOTSA_EXPORT_VTABLE CAECollisionAudioEntity : public CAEAudioEntity {
     void Service();
 
     // notsa
-    bool CanAddNewSound() const { return m_CollisionSoundList.size() != m_NumActiveCollisionSounds; }
+    bool CanAddNewSound() const { return m_NumActiveCollisionSounds <= m_CollisionSoundList.size(); }
 
 protected:
     eSoundID ChooseCollisionSoundID(eSurfaceType surface);