Scrubbed all traces of BYTE, WORD, & DWORD out of the code, remove

[thunder] / src / gui.h

diff --git a/src/gui.h b/src/gui.h
index 317dce521900e5d22b166a78eb8a6a41e876d37d..7193b7372bae9356e438cbf613f55fd52ced733d 100755 (executable)
--- a/src/gui.h
+++ b/src/gui.h
@@ -1,19 +1,15 @@
 //
 // GUI.H
 //
-// by Jimmy Hamm
-// (C) 1998 Underground Software
+// by James L. Hammmons
+// (C) 1998, 2009 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*/
+
+#ifndef __GUI_H__
+#define __GUI_H__
+
 #include "types.h"
+#include "SDL.h"
 
 // Message macros
 
@@ -42,13 +38,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);
 void DrawText(void);
 void InitGUI(void);
 bool ShowGUI(void);
@@ -57,7 +53,7 @@ void SelectLeft(void);
 void SelectRight(void);
 void SelectUp(void);
 void SelectDown(void);
-BYTE UserSelectedSomething(void);
+uint8 UserSelectedSomething(void);
 void SetRefreshRate(bool);
 void ActivateGUI(void);
 void DeactivateGUI(void);
@@ -65,3 +61,5 @@ void HandleGUIDebounce(void);
 void SpawnSound(int, int, int channel = 0);
 //void SoundFunc(uint8 *, uint16);
 void SoundFunc(void *, Uint8 *, int);
+
+#endif // __GUI_H__