Oops, forgot to pull first before the changes. :-P

[thunder] / src / gui.h

diff --git a/src/gui.h b/src/gui.h
index 7193b7372bae9356e438cbf613f55fd52ced733d..4a472c9d476a4ce8b213c50a2ff683597d7f930c 100644 (file)
--- a/src/gui.h
+++ b/src/gui.h
@@ -1,15 +1,14 @@
 //
 // GUI.H
 //
-// by James L. Hammmons
-// (C) 1998, 2009 Underground Software
+// by James Hammmons
+// (C) 1998, 2014 Underground Software
 //
-
 #ifndef __GUI_H__
 #define __GUI_H__
 
-#include "types.h"
-#include "SDL.h"
+#include <stdint.h>
+#include <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
@@ -44,7 +31,7 @@
 #define RESET     9
 #define EXIT      10
 
-void SpawnMsg(uint8);
+void SpawnMsg(uint8_t);
 void DrawText(void);
 void InitGUI(void);
 bool ShowGUI(void);
@@ -53,13 +40,10 @@ void SelectLeft(void);
 void SelectRight(void);
 void SelectUp(void);
 void SelectDown(void);
-uint8 UserSelectedSomething(void);
+uint8_t UserSelectedSomething(void);
 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__