Final fixes for git pull/push kerfuffle. :-P

[thunder] / src / gui.h

diff --git a/src/gui.h b/src/gui.h
index 663dd527dfe9c3429b940ce497c1bbcb17101010..6dfb03f72270113d17a3c526f2e56eb667255f6b 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -4,12 +4,11 @@
 // by James Hammmons
 // (C) 1998, 2014 Underground Software
 //
-
 #ifndef __GUI_H__
 #define __GUI_H__
 
 #include <stdint.h>
-#include "SDL.h"
+#include <SDL2/SDL.h>
 
 // Message macros
 
@@ -18,18 +17,6 @@
 #define MSNAPSHOT 2
 #define MSHOWNUMS 3
 
-// Sound routine macros
-
-#define GAMESOUND 0
-#define USERSOUND 1
-#define PSGSOUND  2
-#define VOCSOUND  3
-#define FMSOUND   4
-
-#define SUNKNOWN  0
-#define SCYA      1
-#define SCAMERA   2
-
 // UserSelectedSomething icon value macros
 
 #define NOGUI     0
@@ -58,8 +45,5 @@ void SetRefreshRate(bool);
 void ActivateGUI(void);
 void DeactivateGUI(void);
 void HandleGUIDebounce(void);
-void SpawnSound(int, int, int channel = 0);
-//void SoundFunc(uint8 *, uint16);
-void SoundFunc(void *, Uint8 *, int);
 
 #endif // __GUI_H__