diff --git a/Quake/console.c b/Quake/console.c index 033deba9..899aedfa 100644 --- a/Quake/console.c +++ b/Quake/console.c @@ -122,7 +122,7 @@ void Con_ToggleConsole_f (void) } else { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_console; } @@ -1229,7 +1229,7 @@ void Con_NotifyBox (const char *text) Con_Printf ("%s", Con_Quakebar(40)); //johnfitz key_count = -2; // wait for a key down and up - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_console; do diff --git a/Quake/gl_vidsdl.c b/Quake/gl_vidsdl.c index 36ddef78..9dbdc470 100644 --- a/Quake/gl_vidsdl.c +++ b/Quake/gl_vidsdl.c @@ -262,7 +262,6 @@ static int VID_SetMode (int modenum) vid.conwidth = vid.width & 0xFFFFFFF8; vid.conheight = vid.conwidth * vid.height / vid.width; vid.numpages = 2; - vid.type = modelist[modenum].type; CDAudio_Resume (); BGM_Resume (); @@ -385,7 +384,7 @@ static void VID_Restart (void) if (vid_fullscreen.value) IN_Activate(); else if (key_dest == key_console || key_dest == key_menu) - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); } /* @@ -1181,10 +1180,10 @@ void VID_Toggle (void) Sbar_Changed (); // Sbar seems to need refreshing windowed = !windowed; - if (vid.type == MODE_FULLSCREEN_DEFAULT) - vid.type = MODE_WINDOWED; + if (modestate == MODE_FULLSCREEN_DEFAULT) + modestate = MODE_WINDOWED; else - vid.type = MODE_FULLSCREEN_DEFAULT; + modestate = MODE_FULLSCREEN_DEFAULT; // since we succeeded, ignore the vid_fullscreen // callback function setting vid_changed to true. @@ -1196,7 +1195,7 @@ void VID_Toggle (void) if (vid_fullscreen.value) IN_Activate(); else if (key_dest == key_console || key_dest == key_menu) - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); } else { @@ -1577,7 +1576,7 @@ VID_Menu_f */ static void VID_Menu_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_video; m_entersound = true; diff --git a/Quake/keys.c b/Quake/keys.c index 0e10a458..857ba726 100644 --- a/Quake/keys.c +++ b/Quake/keys.c @@ -1068,7 +1068,7 @@ void Key_UpdateForDest (void) if (cls.state != ca_connected) { forced = true; - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_console; break; } diff --git a/Quake/menu.c b/Quake/menu.c index 68737d73..83588e91 100644 --- a/Quake/menu.c +++ b/Quake/menu.c @@ -247,7 +247,7 @@ void M_Menu_Main_f (void) m_save_demonum = cls.demonum; cls.demonum = -1; } - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_main; m_entersound = true; @@ -334,7 +334,7 @@ int m_singleplayer_cursor; void M_Menu_SinglePlayer_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_singleplayer; m_entersound = true; @@ -451,7 +451,7 @@ void M_Menu_Load_f (void) m_entersound = true; m_state = m_load; - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; M_ScanSaves (); } @@ -468,7 +468,7 @@ void M_Menu_Save_f (void) m_entersound = true; m_state = m_save; - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; M_ScanSaves (); } @@ -591,7 +591,7 @@ int m_multiplayer_cursor; void M_Menu_MultiPlayer_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_multiplayer; m_entersound = true; @@ -676,7 +676,7 @@ int setup_bottom; void M_Menu_Setup_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_setup; m_entersound = true; @@ -855,7 +855,7 @@ const char *net_helpMessage [] = void M_Menu_Net_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_net; m_entersound = true; @@ -972,7 +972,7 @@ int options_cursor; void M_Menu_Options_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_options; m_entersound = true; @@ -1292,7 +1292,7 @@ static int keys_top; void M_Menu_Keys_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_keys; m_entersound = true; @@ -1416,7 +1416,7 @@ void M_Keys_Key (int k) } m_keys_bind_grab = false; - IN_Deactivate(vid.type == MODE_WINDOWED); // deactivate because we're returning to the menu + IN_Deactivate(modestate == MODE_WINDOWED); // deactivate because we're returning to the menu return; } @@ -1493,7 +1493,7 @@ int help_page; void M_Menu_Help_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_help; m_entersound = true; @@ -1545,7 +1545,7 @@ void M_Menu_Quit_f (void) if (m_state == m_quit) return; wasInMenus = (key_dest == key_menu); - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_quit_prevstate = m_state; m_state = m_quit; @@ -1576,7 +1576,7 @@ void M_Quit_Key (int key) case 'Y': case 'y': - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_console; Host_Quit_f (); break; @@ -1630,7 +1630,7 @@ char lanConfig_joinname[22]; void M_Menu_LanConfig_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_lanconfig; m_entersound = true; @@ -1978,7 +1978,7 @@ double m_serverInfoMessageTime; void M_Menu_GameOptions_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_gameoptions; m_entersound = true; @@ -2282,7 +2282,7 @@ double searchCompleteTime; void M_Menu_Search_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_search; m_entersound = false; @@ -2343,7 +2343,7 @@ qboolean slist_sorted; void M_Menu_ServerList_f (void) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_slist; m_entersound = true; diff --git a/Quake/net_dgrm.c b/Quake/net_dgrm.c index a2eb7055..39c2cc61 100644 --- a/Quake/net_dgrm.c +++ b/Quake/net_dgrm.c @@ -1399,7 +1399,7 @@ ErrorReturn2: dfunc.Close_Socket(newsock); if (m_return_onerror) { - IN_Deactivate(vid.type == MODE_WINDOWED); + IN_Deactivate(modestate == MODE_WINDOWED); key_dest = key_menu; m_state = m_return_state; m_return_onerror = false; diff --git a/Quake/vid.h b/Quake/vid.h index afc91c78..edd97c66 100644 --- a/Quake/vid.h +++ b/Quake/vid.h @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define VID_GRADES (1 << VID_CBITS) // moved here for global use -- kristian -typedef enum { NO_MODE=-1, MODE_WINDOWED, MODE_FULLSCREEN_DEFAULT } modestate_t; +typedef enum { NO_MODE, MODE_WINDOWED, MODE_FULLSCREEN_DEFAULT } modestate_t; extern modestate_t modestate; @@ -61,8 +61,6 @@ typedef struct int maxwarpwidth; int maxwarpheight; pixel_t *direct; // direct drawing to framebuffer, if not NULL - - int type; // kristian } viddef_t; extern viddef_t vid; // global video state