diff --git a/src/st_stuff.c b/src/st_stuff.c index de7eb692..aeeb908d 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -186,24 +186,9 @@ static player_t *plyr; // ST_Start() has just been called static boolean st_firsttime; -// used to execute ST_Init() only once -static int veryfirsttime = 1; - // lump number for PLAYPAL static int lu_palette; -// used for timing -static unsigned int st_clock; - -// used for making messages go away -static int st_msgcounter=0; - -// used when in chat -static st_chatstateenum_t st_chatstate; - -// whether in automap or first-person -static st_stateenum_t st_gamestate; - // whether left-side main status bar is active static boolean st_statusbaron; @@ -211,15 +196,6 @@ static boolean st_statusbaron; boolean st_crispyhud; static boolean st_classicstatusbar; -// whether status bar chat is active -static boolean st_chat; - -// value of st_chat before message popped up -static boolean st_oldchat; - -// whether chat window has the cursor on -static boolean st_cursoron; - // !deathmatch static boolean st_notdeathmatch; @@ -487,17 +463,10 @@ boolean ST_Responder(event_t *ev) // Filter automap on/off. if (ev->type == ev_keyup && (ev->data1 & 0xffff0000) == AM_MSGHEADER) { - switch(ev->data1) - { - case AM_MSGENTERED: - st_gamestate = AutomapState; - st_firsttime = true; - break; - - case AM_MSGEXITED: - st_gamestate = FirstPersonState; - break; - } + if (ev->data1 == AM_MSGENTERED) + { + st_firsttime = true; + } } else // if a user keypress... return M_CheatResponder(ev); // Try cheat responder in m_cheat.c @@ -775,10 +744,6 @@ void ST_updateWidgets(void) st_fragscount -= plyr->frags[i]; } - // get rid of chat window if up because of message - if (!--st_msgcounter) - st_chat = st_oldchat; - } // [Alaux] @@ -813,7 +778,6 @@ void ST_Ticker(void) st_health = SmoothCount(st_health, plyr->health); st_armor = SmoothCount(st_armor, plyr->armorpoints); - st_clock++; st_randomnumber = M_Random(); ST_updateWidgets(); st_oldhealth = plyr->health; @@ -993,25 +957,6 @@ void ST_drawWidgets(void) } -void ST_doRefresh(void) -{ - - st_firsttime = false; - - // draw status bar background to off-screen buff - ST_refreshBackground(false); - - // and refresh all widgets - ST_drawWidgets(); - -} - -void ST_diffDraw(void) -{ - // update all widgets - ST_drawWidgets(); -} - static void ST_MoveHud (void); void ST_Drawer(boolean fullscreen, boolean refresh) @@ -1028,10 +973,15 @@ void ST_Drawer(boolean fullscreen, boolean refresh) ST_doPaletteStuff(); // Do red-/gold-shifts from damage/items - if (st_firsttime) - ST_doRefresh(); // If just after ST_Start(), refresh all - else - ST_diffDraw(); // Otherwise, update as little as possible + if (st_firsttime) // If just after ST_Start(), refresh all + { + st_firsttime = false; + + // draw status bar background to off-screen buff + ST_refreshBackground(false); + } + + ST_drawWidgets(); } void ST_loadGraphics(void) @@ -1138,51 +1088,6 @@ void ST_loadData(void) ST_loadGraphics(); } -void ST_unloadGraphics(void) -{ - int i; - - // unload the numbers, tall and short - for (i=0;i<10;i++) - { - Z_ChangeTag(tallnum[i], PU_CACHE); - Z_ChangeTag(shortnum[i], PU_CACHE); - } - - // unload tall percent - Z_ChangeTag(tallpercent, PU_CACHE); - - // unload arms background - Z_ChangeTag(armsbg, PU_CACHE); - - // unload gray #'s - for (i=0;i<6;i++) - Z_ChangeTag(arms[i][0], PU_CACHE); - - // unload the key cards - for (i=0;i