fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove "type" from "viddef_t", use "modestate" instead 

git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@804 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
svdijk 2013-02-13 19:01:26 +00:00
parent 31b08a50e3
commit eea756eb80
6 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Quake/console.c
View File

@ -122,7 +122,7 @@ void Con_ToggleConsole_f (void)
} }
else else
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_console; key_dest = key_console;
} }
@ -1229,7 +1229,7 @@ void Con_NotifyBox (const char *text)
Con_Printf ("%s", Con_Quakebar(40)); //johnfitz Con_Printf ("%s", Con_Quakebar(40)); //johnfitz
key_count = -2; // wait for a key down and up 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; key_dest = key_console;
do do

13
Quake/gl_vidsdl.c
View File

@ -262,7 +262,6 @@ static int VID_SetMode (int modenum)
vid.conwidth = vid.width & 0xFFFFFFF8; vid.conwidth = vid.width & 0xFFFFFFF8;
vid.conheight = vid.conwidth * vid.height / vid.width; vid.conheight = vid.conwidth * vid.height / vid.width;
vid.numpages = 2; vid.numpages = 2;
vid.type = modelist[modenum].type;
CDAudio_Resume (); CDAudio_Resume ();
BGM_Resume (); BGM_Resume ();
@ -385,7 +384,7 @@ static void VID_Restart (void)
if (vid_fullscreen.value) if (vid_fullscreen.value)
IN_Activate(); IN_Activate();
else if (key_dest == key_console || key_dest == key_menu) 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 Sbar_Changed (); // Sbar seems to need refreshing
windowed = !windowed; windowed = !windowed;
if (vid.type == MODE_FULLSCREEN_DEFAULT) if (modestate == MODE_FULLSCREEN_DEFAULT)
vid.type = MODE_WINDOWED; modestate = MODE_WINDOWED;
else else
vid.type = MODE_FULLSCREEN_DEFAULT; modestate = MODE_FULLSCREEN_DEFAULT;
// since we succeeded, ignore the vid_fullscreen // since we succeeded, ignore the vid_fullscreen
// callback function setting vid_changed to true. // callback function setting vid_changed to true.
@ -1196,7 +1195,7 @@ void VID_Toggle (void)
if (vid_fullscreen.value) if (vid_fullscreen.value)
IN_Activate(); IN_Activate();
else if (key_dest == key_console || key_dest == key_menu) else if (key_dest == key_console || key_dest == key_menu)
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
} }
else else
{ {
@ -1577,7 +1576,7 @@ VID_Menu_f
*/ */
static void VID_Menu_f (void) static void VID_Menu_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_video; m_state = m_video;
m_entersound = true; m_entersound = true;

2
Quake/keys.c
View File

@ -1068,7 +1068,7 @@ void Key_UpdateForDest (void)
if (cls.state != ca_connected) if (cls.state != ca_connected)
{ {
forced = true; forced = true;
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_console; key_dest = key_console;
break; break;
} }

34
Quake/menu.c
View File

@ -247,7 +247,7 @@ void M_Menu_Main_f (void)
m_save_demonum = cls.demonum; m_save_demonum = cls.demonum;
cls.demonum = -1; cls.demonum = -1;
} }
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_main; m_state = m_main;
m_entersound = true; m_entersound = true;
@ -334,7 +334,7 @@ int m_singleplayer_cursor;
void M_Menu_SinglePlayer_f (void) void M_Menu_SinglePlayer_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_singleplayer; m_state = m_singleplayer;
m_entersound = true; m_entersound = true;
@ -451,7 +451,7 @@ void M_Menu_Load_f (void)
m_entersound = true; m_entersound = true;
m_state = m_load; m_state = m_load;
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
M_ScanSaves (); M_ScanSaves ();
} }
@ -468,7 +468,7 @@ void M_Menu_Save_f (void)
m_entersound = true; m_entersound = true;
m_state = m_save; m_state = m_save;
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
M_ScanSaves (); M_ScanSaves ();
} }
@ -591,7 +591,7 @@ int m_multiplayer_cursor;
void M_Menu_MultiPlayer_f (void) void M_Menu_MultiPlayer_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_multiplayer; m_state = m_multiplayer;
m_entersound = true; m_entersound = true;
@ -676,7 +676,7 @@ int setup_bottom;
void M_Menu_Setup_f (void) void M_Menu_Setup_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_setup; m_state = m_setup;
m_entersound = true; m_entersound = true;
@ -855,7 +855,7 @@ const char *net_helpMessage [] =
void M_Menu_Net_f (void) void M_Menu_Net_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_net; m_state = m_net;
m_entersound = true; m_entersound = true;
@ -972,7 +972,7 @@ int options_cursor;
void M_Menu_Options_f (void) void M_Menu_Options_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_options; m_state = m_options;
m_entersound = true; m_entersound = true;
@ -1292,7 +1292,7 @@ static int keys_top;
void M_Menu_Keys_f (void) void M_Menu_Keys_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_keys; m_state = m_keys;
m_entersound = true; m_entersound = true;
@ -1416,7 +1416,7 @@ void M_Keys_Key (int k)
} }
m_keys_bind_grab = false; 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; return;
} }
@ -1493,7 +1493,7 @@ int help_page;
void M_Menu_Help_f (void) void M_Menu_Help_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_help; m_state = m_help;
m_entersound = true; m_entersound = true;
@ -1545,7 +1545,7 @@ void M_Menu_Quit_f (void)
if (m_state == m_quit) if (m_state == m_quit)
return; return;
wasInMenus = (key_dest == key_menu); wasInMenus = (key_dest == key_menu);
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_quit_prevstate = m_state; m_quit_prevstate = m_state;
m_state = m_quit; m_state = m_quit;
@ -1576,7 +1576,7 @@ void M_Quit_Key (int key)
case 'Y': case 'Y':
case 'y': case 'y':
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_console; key_dest = key_console;
Host_Quit_f (); Host_Quit_f ();
break; break;
@ -1630,7 +1630,7 @@ char lanConfig_joinname[22];
void M_Menu_LanConfig_f (void) void M_Menu_LanConfig_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_lanconfig; m_state = m_lanconfig;
m_entersound = true; m_entersound = true;
@ -1978,7 +1978,7 @@ double m_serverInfoMessageTime;
void M_Menu_GameOptions_f (void) void M_Menu_GameOptions_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_gameoptions; m_state = m_gameoptions;
m_entersound = true; m_entersound = true;
@ -2282,7 +2282,7 @@ double searchCompleteTime;
void M_Menu_Search_f (void) void M_Menu_Search_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_search; m_state = m_search;
m_entersound = false; m_entersound = false;
@ -2343,7 +2343,7 @@ qboolean slist_sorted;
void M_Menu_ServerList_f (void) void M_Menu_ServerList_f (void)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_slist; m_state = m_slist;
m_entersound = true; m_entersound = true;

2
Quake/net_dgrm.c
View File

@ -1399,7 +1399,7 @@ ErrorReturn2:
dfunc.Close_Socket(newsock); dfunc.Close_Socket(newsock);
if (m_return_onerror) if (m_return_onerror)
{ {
IN_Deactivate(vid.type == MODE_WINDOWED); IN_Deactivate(modestate == MODE_WINDOWED);
key_dest = key_menu; key_dest = key_menu;
m_state = m_return_state; m_state = m_return_state;
m_return_onerror = false; m_return_onerror = false;

4
Quake/vid.h
View File

@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define VID_GRADES (1 << VID_CBITS) #define VID_GRADES (1 << VID_CBITS)
// moved here for global use -- kristian // 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; extern modestate_t modestate;
@ -61,8 +61,6 @@ typedef struct
int maxwarpwidth; int maxwarpwidth;
int maxwarpheight; int maxwarpheight;
pixel_t *direct; // direct drawing to framebuffer, if not NULL pixel_t *direct; // direct drawing to framebuffer, if not NULL
int type; // kristian
} viddef_t; } viddef_t;
extern viddef_t vid; // global video state extern viddef_t vid; // global video state