- fix merge errors.

source/audiolib/src/drivers.cpp

@@ -66,26 +66,7 @@ static struct {
     void (*MIDI_Unlock)(void);
 } SoundDrivers[ASS_NumSoundCards] = {
     
-    // Everyone gets the "no sound" driver
+  
-    {
-        "null sound device",
-        NoSoundDrv_GetError,
-        NoSoundDrv_ErrorString,
-        NoSoundDrv_PCM_Init,
-        NoSoundDrv_PCM_Shutdown,
-        NoSoundDrv_PCM_BeginPlayback,
-        NoSoundDrv_PCM_StopPlayback,
-        NoSoundDrv_PCM_Lock,
-        NoSoundDrv_PCM_Unlock,
-        NoSoundDrv_MIDI_Init,
-        NoSoundDrv_MIDI_Shutdown,
-        NoSoundDrv_MIDI_StartPlayback,
-        NoSoundDrv_MIDI_HaltPlayback,
-        NoSoundDrv_MIDI_SetTempo,
-        NoSoundDrv_MIDI_Lock,
-        NoSoundDrv_MIDI_Unlock,
-   },
-    
     // Simple DirectMedia Layer
     {
         "SDL",

source/build/include/hash.h

@@ -80,6 +80,4 @@ intptr_t inthash_find(inthashtable_t const *t, intptr_t key);
 // ideally we would find the next largest prime number
 #define INTHASH_SIZE(size) ((size * 4u / 3u) | 1u)
 
-#endif
-
 #endif // hash_h_

source/build/src/hash.cpp

@@ -211,7 +211,7 @@ void inthash_add(inthashtable_t *t, intptr_t key, intptr_t value, int32_t replac
     while (tail->collision != nullptr && tail != seeker);
 
     if (EDUKE32_PREDICT_FALSE(tail == seeker))
-        fatal_exit("inthash_add(): table full!\n");
+        I_Error("inthash_add(): table full!\n");
 
     tail->key = key;
     tail->value = value;

source/duke3d/src/cheats.cpp

@@ -245,7 +245,6 @@ static void end_cheat(DukePlayer_t * const pPlayer)
     pPlayer->cheat_phase = 0;
     g_cheatBufLen = 0;
     inputState.keyFlushChars();
-    KB_ClearKeysDown();
 }
 
 int g_cheatBufLen;