fully separate render

[flatwaifu.git] / src / menu.c

diff --git a/src/menu.c b/src/menu.c
index 415b68db2cd5be0acaab2c6c7bee7175bd017ef9..7d5f374ddff2e0c791c5c5327973ee9f6c997795 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
@@ -26,7 +26,6 @@
 #include <stdlib.h>
 #include "files.h"
 #include "memory.h"
-#include "vga.h"
 #include "error.h"
 #include "keyb.h"
 #include "sound.h"
@@ -35,6 +34,7 @@
 #include "switch.h"
 #include "menu.h"
 #include "misc.h"
+#include "render.h"
 
 #include <SDL.h>
 #include <sys/stat.h>
@@ -155,6 +155,8 @@ static byte cbuf[32];
 static snd_t *voc=NULL;
 static int voc_ch=0;
 
+extern byte shot_vga; // config.c
+
 void GMV_stop(void) {
   if(voc) {
     if(voc_ch) {S_stop(voc_ch);voc_ch=0;}
@@ -237,8 +239,7 @@ void GM_command(int c) {
     case CANCEL:
       GM_set(NULL);break;
     case INTERP:
-      fullscreen=!fullscreen;
-      V_toggle();
+      R_toggle_fullscreen();
       GM_set(mnu);
       break;
     case MUSIC:
@@ -329,8 +330,12 @@ void GM_command(int c) {
          S_volumemusic(mus_vol-8);break;
        case MVOLP:
          S_volumemusic(mus_vol+8);break;
-       case GAMMAM: setgamma(gammaa-1);break;
-       case GAMMAP: setgamma(gammaa+1);break;
+       case GAMMAM:
+    R_setgamma(R_getgamma() - 1);
+    break;
+       case GAMMAP:
+    R_setgamma(R_getgamma() + 1);
+    break;
   }
 }
 
@@ -412,9 +417,6 @@ byte get_keychar(int keysym)
     return 0;
 }
 
-extern vgapal main_pal,std_pal;
-extern byte shot_vga;
-
 static void shot(void) {
   static int num=1;
   char fn[100];//...