active menu and hud enable are global.

This commit is contained in:
cracker64
2011-07-22 10:08:13 -04:00
parent d013aa3632
commit 2f714606d7
2 changed files with 6 additions and 2 deletions

View File

@@ -146,6 +146,9 @@ extern int sound_enable;
extern int kiosk_enable; extern int kiosk_enable;
extern int aheat_enable; extern int aheat_enable;
extern int decorations_enable; extern int decorations_enable;
extern int hud_enable;
extern int active_menu;
extern int sys_pause; extern int sys_pause;
extern int framerender; extern int framerender;

View File

@@ -178,6 +178,8 @@ int legacy_enable = 0; //Used to disable new features such as heat, will be set
int ngrav_enable = 0; //Newtonian gravity, will be set by save int ngrav_enable = 0; //Newtonian gravity, will be set by save
int aheat_enable; //Ambient heat int aheat_enable; //Ambient heat
int decorations_enable = 1; int decorations_enable = 1;
int hud_enable = 1;
int active_menu = 0;
int death = 0, framerender = 0; int death = 0, framerender = 0;
int amd = 1; int amd = 1;
int FPSB = 0; int FPSB = 0;
@@ -1545,8 +1547,6 @@ int main(int argc, char *argv[])
{ {
pixel *part_vbuf; //Extra video buffer pixel *part_vbuf; //Extra video buffer
pixel *part_vbuf_store; pixel *part_vbuf_store;
int hud_enable = 1;
int active_menu = 0;
#ifdef BETA #ifdef BETA
int is_beta = 0; int is_beta = 0;
#endif #endif
@@ -2375,6 +2375,7 @@ int main(int argc, char *argv[])
if (sdl_key==SDLK_SPACE) if (sdl_key==SDLK_SPACE)
sys_pause = !sys_pause; sys_pause = !sys_pause;
if (sdl_key=='u') if (sdl_key=='u')
aheat_enable = !aheat_enable; aheat_enable = !aheat_enable;
if (sdl_key=='h') if (sdl_key=='h')
hud_enable = !hud_enable; hud_enable = !hud_enable;