X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fgui.h;h=a5d4c6fa26659c75e500cec53fbf95200f3b53b8;hb=44a4bdffcaf520bc1681fcc0fd330460cd49129f;hp=7193b7372bae9356e438cbf613f55fd52ced733d;hpb=87647f03b4d7cf53948ed8f9f25ad30da5e596bf;p=thunder

diff --git a/src/gui.h b/src/gui.h
old mode 100755
new mode 100644
index 7193b73..a5d4c6f
--- a/src/gui.h
+++ b/src/gui.h
@@ -1,15 +1,15 @@
 //
 // 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 <SDL2/SDL.h>
 
 // Message macros
 
@@ -18,18 +18,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 +32,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 +41,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__