summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--setup/mainmenu.c2
-rw-r--r--setup/multiplayer.c4
-rw-r--r--setup/txt_keyinput.c2
-rw-r--r--setup/txt_mouseinput.c2
4 files changed, 6 insertions, 4 deletions
diff --git a/setup/mainmenu.c b/setup/mainmenu.c
index b55cffa2..a4727519 100644
--- a/setup/mainmenu.c
+++ b/setup/mainmenu.c
@@ -112,5 +112,7 @@ int main(int argc, char *argv[])
MainMenu();
TXT_GUIMainLoop();
+
+ return 0;
}
diff --git a/setup/multiplayer.c b/setup/multiplayer.c
index d24be302..86ee07f7 100644
--- a/setup/multiplayer.c
+++ b/setup/multiplayer.c
@@ -60,7 +60,7 @@ warptype_t warptype = WARP_DOOM2;
int warpepisode = 1;
int warpmap = 1;
-static void StartGame(void)
+static void StartGame(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
{
printf("Now we start the game.\n");
exit(0);
@@ -197,7 +197,7 @@ static txt_window_action_t *StartGameAction(void)
return action;
}
-static void OpenWadsWindow(void)
+static void OpenWadsWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))
{
txt_window_t *window;
int i;
diff --git a/setup/txt_keyinput.c b/setup/txt_keyinput.c
index f6390154..8aed3998 100644
--- a/setup/txt_keyinput.c
+++ b/setup/txt_keyinput.c
@@ -25,6 +25,7 @@
#include "doomkeys.h"
#include "txt_keyinput.h"
+#include "txt_gui.h"
#include "txt_io.h"
#include "txt_label.h"
#include "txt_window.h"
@@ -117,7 +118,6 @@ static void TXT_KeyInputDrawer(TXT_UNCAST_ARG(key_input), int selected)
static void TXT_KeyInputDestructor(TXT_UNCAST_ARG(key_input))
{
- TXT_CAST_ARG(txt_key_input_t, key_input);
}
static int TXT_KeyInputKeyPress(TXT_UNCAST_ARG(key_input), int key)
diff --git a/setup/txt_mouseinput.c b/setup/txt_mouseinput.c
index 1a4489b4..f389a38e 100644
--- a/setup/txt_mouseinput.c
+++ b/setup/txt_mouseinput.c
@@ -26,6 +26,7 @@
#include "doomkeys.h"
#include "txt_mouseinput.h"
+#include "txt_gui.h"
#include "txt_io.h"
#include "txt_label.h"
#include "txt_window.h"
@@ -146,7 +147,6 @@ static void TXT_MouseInputDrawer(TXT_UNCAST_ARG(mouse_input), int selected)
static void TXT_MouseInputDestructor(TXT_UNCAST_ARG(mouse_input))
{
- TXT_CAST_ARG(txt_mouse_input_t, mouse_input);
}
static int TXT_MouseInputKeyPress(TXT_UNCAST_ARG(mouse_input), int mouse)