shithub: choc

Info  •  Files  •  Log  •  Branches

Shut up compiler warnings for setup.

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

--- a/setup/display.c

+++ b/setup/display.c

@@ -41,7 +41,7 @@

         { "960x720",  2, 3 },

         { "1280x800", 1, 4 },

         { "1280x960", 2, 4 },

-        { NULL },

+        { NULL,       0, 0 },

 };

 static int vidmode = 0;

--- a/setup/keyboard.c

+++ b/setup/keyboard.c

@@ -44,7 +44,7 @@

 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)

     {

--- a/setup/mouse.c

+++ b/setup/mouse.c

@@ -44,7 +44,7 @@

 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)

--- a/setup/txt_keyinput.c

+++ b/setup/txt_keyinput.c

@@ -155,6 +155,7 @@

     TXT_KeyInputKeyPress,

     TXT_KeyInputDestructor,

     TXT_KeyInputMousePress,

+    NULL,

 };

 txt_key_input_t *TXT_NewKeyInput(int *variable)

--- a/setup/txt_mouseinput.c

+++ b/setup/txt_mouseinput.c

@@ -184,6 +184,7 @@

     TXT_MouseInputKeyPress,

     TXT_MouseInputDestructor,

     TXT_MouseInputMousePress,

+    NULL,

 };

 txt_mouse_input_t *TXT_NewMouseInput(int *variable)