shithub: choc

Info  •  Files  •  Log  •  Branches

Fix chocolate-setup warnings.

Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 627

--- a/setup/mainmenu.c

+++ b/setup/mainmenu.c

@@ -112,5 +112,7 @@

     MainMenu();

     TXT_GUIMainLoop();

+

+    return 0;

 }

--- a/setup/multiplayer.c

+++ b/setup/multiplayer.c

@@ -60,7 +60,7 @@

 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 @@

     return action;

 }

-static void OpenWadsWindow(void)

+static void OpenWadsWindow(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(user_data))

 {

     txt_window_t *window;

     int i;

--- 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_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)

--- 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_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)