diff options
| author | James Haley | 2010-09-01 06:48:16 +0000 |
|---|---|---|
| committer | James Haley | 2010-09-01 06:48:16 +0000 |
| commit | 87185424769c6c2dd8207f0b63dc787f98011496 (patch) | |
| tree | d81d4620984faa04bd107f22af5b861690246b14 /src/strife/d_main.c | |
| parent | 546efd64b71ff3935e2068f2e0dbf950e7a7dd03 (diff) | |
| download | chocolate-doom-87185424769c6c2dd8207f0b63dc787f98011496.tar.gz chocolate-doom-87185424769c6c2dd8207f0b63dc787f98011496.tar.bz2 chocolate-doom-87185424769c6c2dd8207f0b63dc787f98011496.zip | |
Started work on status bar, including loading and drawing some of the
background graphics. Added ST_DrawExternal routine and corresponding
call logic in D_Display for drawing popups and other bits that are
outside the normal statbar. Moved automap mapname widget up 7 pixels.
Needs verification via screenshots.
Subversion-branch: /branches/strife-branch
Subversion-revision: 1994
Diffstat (limited to 'src/strife/d_main.c')
| -rw-r--r-- | src/strife/d_main.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/strife/d_main.c b/src/strife/d_main.c index 73de4c9b..a2799cae 100644 --- a/src/strife/d_main.c +++ b/src/strife/d_main.c @@ -178,6 +178,7 @@ void D_ProcessEvents (void) // // haleyjd 08/23/10: [STRIFE]: // * Changes to eliminate intermission and change timing of screenwipe +// * 9/01/10: Added ST_DrawExternal and popupactivestate static variable // gamestate_t wipegamestate = GS_DEMOSCREEN; extern boolean setsizeneeded; @@ -189,6 +190,7 @@ void D_Display (void) static boolean viewactivestate = false; static boolean menuactivestate = false; static boolean inhelpscreensstate = false; + static boolean popupactivestate = false; // [STRIFE] static boolean fullscreen = false; static gamestate_t oldgamestate = -1; static int borderdrawcount; @@ -267,16 +269,13 @@ void D_Display (void) if (gamestate == GS_LEVEL && gametic) { HU_Drawer (); - // STRIFE-TODO: ST_DrawMore, unknown variable dword_861C8 - /* - if(ST_DrawMore()) - dword_861C8 = 1; - else if(dword_861C8) + if(ST_DrawExternal()) + popupactivestate = true; + else if(popupactivestate) { - dword_861C8 = 0; + popupactivestate = false; menuactivestate = 1; } - */ } // clean up border stuff @@ -296,8 +295,7 @@ void D_Display (void) if (menuactive || menuactivestate || !viewactivestate) { borderdrawcount = 3; - // STRIFE-FIXME / TODO: Unknown variable - // dword_861C8 = 0; + popupactivestate = false; } if (borderdrawcount) { |