commit edf23305df765d4a8e35f3ca375566766fa251e4
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Thu Oct 12 17:34:32 2006 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Thu Oct 12 17:34:32 2006 +0000

    Shut up compiler warnings for setup.

    Subversion-branch: /trunk/chocolate-doom
    Subversion-revision: 696
---
 setup/display.c        | 2 +-
 setup/keyboard.c       | 2 +-
 setup/mouse.c          | 2 +-
 setup/txt_keyinput.c   | 1 +
 setup/txt_mouseinput.c | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/setup/display.c b/setup/display.c
index 2672c7d8..7f19d040 100644
--- a/setup/display.c
+++ b/setup/display.c
@@ -41,7 +41,7 @@ static vidmode_t modes[] =
         { "960x720",  2, 3 },
         { "1280x800", 1, 4 },
         { "1280x960", 2, 4 },
-        { NULL },
+        { NULL,       0, 0 },
 };

 static int vidmode = 0;
diff --git a/setup/keyboard.c b/setup/keyboard.c
index 1c5f38ee..9f4990ba 100644
--- a/setup/keyboard.c
+++ b/setup/keyboard.c
@@ -44,7 +44,7 @@ static int *allkeys[] = {&key_left, &key_right, &key_up, &key_down,
 static void KeySetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
 {
     TXT_CAST_ARG(int, variable);
-    int i;
+    unsigned int i;

     for (i=0; i<sizeof(allkeys) / sizeof(*allkeys); ++i)
     {
diff --git a/setup/mouse.c b/setup/mouse.c
index bd3aa8a5..3dd9330b 100644
--- a/setup/mouse.c
+++ b/setup/mouse.c
@@ -44,7 +44,7 @@ static int *all_mouse_buttons[] = {&mouseb_fire, &mouseb_strafe,
 static void MouseSetCallback(TXT_UNCAST_ARG(widget), TXT_UNCAST_ARG(variable))
 {
     TXT_CAST_ARG(int, variable);
-    int i;
+    unsigned int i;

     // Check if the same mouse button is used for a different action
     // If so, set the other action(s) to -1 (unset)
diff --git a/setup/txt_keyinput.c b/setup/txt_keyinput.c
index af939c71..bdf2f926 100644
--- a/setup/txt_keyinput.c
+++ b/setup/txt_keyinput.c
@@ -155,6 +155,7 @@ txt_widget_class_t txt_key_input_class =
     TXT_KeyInputKeyPress,
     TXT_KeyInputDestructor,
     TXT_KeyInputMousePress,
+    NULL,
 };

 txt_key_input_t *TXT_NewKeyInput(int *variable)
diff --git a/setup/txt_mouseinput.c b/setup/txt_mouseinput.c
index 9dd0a2f8..4e8cf2f3 100644
--- a/setup/txt_mouseinput.c
+++ b/setup/txt_mouseinput.c
@@ -184,6 +184,7 @@ txt_widget_class_t txt_mouse_input_class =
     TXT_MouseInputKeyPress,
     TXT_MouseInputDestructor,
     TXT_MouseInputMousePress,
+    NULL,
 };

 txt_mouse_input_t *TXT_NewMouseInput(int *variable)