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

[thunder] / src / gui.h

diff --git a/src/gui.h b/src/gui.h
old mode 100755 (executable)
new mode 100644 (file)
index 317dce5..4a472c9
--- a/src/gui.h
+++ b/src/gui.h
@@ -1,19 +1,14 @@
 //
 // GUI.H
 //
-// by Jimmy Hamm
-// (C) 1998 Underground Software
+// by James Hammmons
+// (C) 1998, 2014 Underground Software
 //
-/*#define BYTE  unsigned char
-#define WORD  unsigned short int
-#define DWORD unsigned long int
-#define int8  char
-#define int16 short
-#define int32 int
-#define uint8  unsigned int8
-#define uint16 unsigned int16
-#define uint32 unsigned int32*/
-#include "types.h"
+#ifndef __GUI_H__
+#define __GUI_H__
+
+#include <stdint.h>
+#include <SDL.h>
 
 // Message macros
 
@@ -22,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
@@ -42,13 +25,13 @@
 #define PL2START  3
 #define REFRESH   4
 #define DIPSWITCH 5
-#define OPTIONS   6 
+#define OPTIONS   6
 #define KEYCONFIG 7
 #define SNAPSHOT  8
 #define RESET     9
 #define EXIT      10
 
-void SpawnMsg(BYTE);
+void SpawnMsg(uint8_t);
 void DrawText(void);
 void InitGUI(void);
 bool ShowGUI(void);
@@ -57,11 +40,10 @@ void SelectLeft(void);
 void SelectRight(void);
 void SelectUp(void);
 void SelectDown(void);
-BYTE 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__