remove devwindow

[vg.git] / vg.h

diff --git a/vg.h b/vg.h
index 82f95fcceab3a17469a552feee97b06d4528373f..2f6f340ac31d82078d02f53144f39f8e09437b8f 100644 (file)
--- a/vg.h
+++ b/vg.h
@@ -44,6 +44,11 @@
 |   | |      v
 |IMP| |   vg_gui(void)
 |   | |      |
+|   | |      v
+|IMP| |   vg_game_settings_init(void)
+|IMP| |   vg_game_settings_gui( ui_rect panel ) 
+|   | |      |     (optional: #define VG_GAME_SETTINGS)
+|   | |      |
 |   |  '----'
 '___'
 
@@ -758,44 +763,31 @@ static void _vg_init_window( const char *window_name )
    vg.window_x = video_mode.w;
    vg.window_y = video_mode.h;
 
+   if( vg.screen_mode == 2 ){
+      vg.window_x = 1280;
+      vg.window_y = 720;
+   }
+
 #ifndef _WIN32
        SDL_SetHint( "SDL_VIDEO_X11_XINERAMA", "1" );
        SDL_SetHint( "SDL_VIDEO_X11_XRANDR", "0" );
        SDL_SetHint( "SDL_VIDEO_X11_XVIDMODE", "0" );
 #endif
 
-   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED;
-
-#ifdef VG_DEVWINDOW
-   flags |= SDL_WINDOW_BORDERLESS;
-   vg.screen_mode = 2;
-   vg.window_x = 1280;
-   vg.window_y = 720;
-#else
+   u32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_INPUT_GRABBED |
+               SDL_WINDOW_RESIZABLE;
 
-   if( vg.screen_mode == 2 )
-      flags |= SDL_WINDOW_RESIZABLE;
-   else if( vg.screen_mode == 1 )
+   if( vg.screen_mode == 1 )
       flags |= SDL_WINDOW_FULLSCREEN;
-   else
+   else if( vg.screen_mode == 0 )
       flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
 
-#endif
-
    vg_info( "CreateWindow( %d %d %u )\n", vg.window_x, vg.window_y, flags );
 
-   if((vg.window = SDL_CreateWindow( window_name,
-         0, 0, vg.window_x, vg.window_y, flags ))){
-
-#ifdef VG_DEVWINDOW
-      SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
-#endif
-      
-      if( SDL_SetWindowDisplayMode( vg.window, &video_mode ) ){
-         vg_error( "SDL_SetWindowDisplayMode failed: %s", SDL_GetError() );
-         SDL_Quit();
-         exit(0);
-      }
+   if((vg.window = SDL_CreateWindow( window_name, 0, 0, 
+                                     vg.window_x, vg.window_y, flags ))){
+      if( vg.screen_mode == 2 )
+         SDL_SetWindowPosition( vg.window, video_mode.w-vg.window_x, 0 );
    }
    else{
       vg_error( "SDL_CreateWindow failed: %s", SDL_GetError() );
@@ -885,6 +877,7 @@ static void vg_enter( int argc, char *argv[], const char *window_name ){
                         k_var_dtype_i32, VG_VAR_PERSISTENT );
    vg_console_reg_var( "vg_screen_mode", &vg.screen_mode,
                         k_var_dtype_i32, VG_VAR_PERSISTENT );
+   vg_audio_register();
    vg_console_load_autos();
 
    vg_console_reg_cmd( "vg_settings", cmd_vg_settings_toggle, NULL );