split/merge working with water

[fishladder.git] / vg / vg.h

diff --git a/vg/vg.h b/vg/vg.h
index b35091b5aa5e2779e39c64ccf76bdad1dee225ee..a7e520546e7f18530d68eb477f741f79682e3ff8 100644 (file)
--- a/vg/vg.h
+++ b/vg/vg.h
@@ -132,7 +132,7 @@ static inline int vg_get_button_up( const char *button )
 
 static inline int key_is_keyboard( int const id )
 {
-       static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
+       vg_static_assert( GLFW_MOUSE_BUTTON_LAST < GLFW_KEY_SPACE, "GLFW: Mouse has too many buttons" );
        return id > GLFW_MOUSE_BUTTON_LAST;
 }
 
@@ -334,7 +334,7 @@ static void vg_init( int argc, char *argv[], const char *window_name )
                        vg_gamepad_ready = 1;
                        vg_gamepad_id = id;
                        
-                       return;
+                       break;
                }
        }