mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
- fix merge errors.
This commit is contained in:
parent
0456d8f36d
commit
a74797b97c
4 changed files with 2 additions and 24 deletions
|
@ -66,25 +66,6 @@ static struct {
|
||||||
void (*MIDI_Unlock)(void);
|
void (*MIDI_Unlock)(void);
|
||||||
} SoundDrivers[ASS_NumSoundCards] = {
|
} 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
|
// Simple DirectMedia Layer
|
||||||
{
|
{
|
||||||
|
|
|
@ -80,6 +80,4 @@ intptr_t inthash_find(inthashtable_t const *t, intptr_t key);
|
||||||
// ideally we would find the next largest prime number
|
// ideally we would find the next largest prime number
|
||||||
#define INTHASH_SIZE(size) ((size * 4u / 3u) | 1u)
|
#define INTHASH_SIZE(size) ((size * 4u / 3u) | 1u)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif // hash_h_
|
#endif // hash_h_
|
||||||
|
|
|
@ -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);
|
while (tail->collision != nullptr && tail != seeker);
|
||||||
|
|
||||||
if (EDUKE32_PREDICT_FALSE(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->key = key;
|
||||||
tail->value = value;
|
tail->value = value;
|
||||||
|
|
|
@ -245,7 +245,6 @@ static void end_cheat(DukePlayer_t * const pPlayer)
|
||||||
pPlayer->cheat_phase = 0;
|
pPlayer->cheat_phase = 0;
|
||||||
g_cheatBufLen = 0;
|
g_cheatBufLen = 0;
|
||||||
inputState.keyFlushChars();
|
inputState.keyFlushChars();
|
||||||
KB_ClearKeysDown();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int g_cheatBufLen;
|
int g_cheatBufLen;
|
||||||
|
|
Loading…
Reference in a new issue