mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-26 05:51:20 +00:00
- moved chatmodeon to the backend.
This commit is contained in:
parent
12adee5256
commit
01f8131969
9 changed files with 4 additions and 12 deletions
|
@ -49,8 +49,6 @@
|
||||||
|
|
||||||
#include "d_eventbase.h"
|
#include "d_eventbase.h"
|
||||||
|
|
||||||
extern int chatmodeon;
|
|
||||||
|
|
||||||
const char *KeyNames[NUM_KEYS] =
|
const char *KeyNames[NUM_KEYS] =
|
||||||
{
|
{
|
||||||
// We use the DirectInput codes and assume a qwerty keyboard layout.
|
// We use the DirectInput codes and assume a qwerty keyboard layout.
|
||||||
|
|
|
@ -71,6 +71,7 @@
|
||||||
#define BOTTOMARGIN 12
|
#define BOTTOMARGIN 12
|
||||||
|
|
||||||
extern bool AppActive;
|
extern bool AppActive;
|
||||||
|
int chatmodeon;
|
||||||
|
|
||||||
CUSTOM_CVAR(Int, con_buffersize, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
CUSTOM_CVAR(Int, con_buffersize, -1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
||||||
{
|
{
|
||||||
|
@ -95,7 +96,6 @@ static FTextureID conflat;
|
||||||
static uint32_t conshade;
|
static uint32_t conshade;
|
||||||
static bool conline;
|
static bool conline;
|
||||||
|
|
||||||
extern int chatmodeon;
|
|
||||||
extern FBaseCVar *CVars;
|
extern FBaseCVar *CVars;
|
||||||
extern FConsoleCommand *Commands[FConsoleCommand::HASH_SIZE];
|
extern FConsoleCommand *Commands[FConsoleCommand::HASH_SIZE];
|
||||||
|
|
||||||
|
|
|
@ -85,5 +85,6 @@ extern double NotifyFontScale;
|
||||||
void C_SetNotifyFontScale(double scale);
|
void C_SetNotifyFontScale(double scale);
|
||||||
|
|
||||||
extern const char *console_bar;
|
extern const char *console_bar;
|
||||||
|
extern int chatmodeon;
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -59,7 +59,6 @@ void M_StartControlPanel(bool makeSound, bool scaleoverride = false);
|
||||||
|
|
||||||
int DMenu::InMenu;
|
int DMenu::InMenu;
|
||||||
static ScaleOverrider *CurrentScaleOverrider;
|
static ScaleOverrider *CurrentScaleOverrider;
|
||||||
extern int chatmodeon;
|
|
||||||
//
|
//
|
||||||
// Todo: Move these elsewhere
|
// Todo: Move these elsewhere
|
||||||
//
|
//
|
||||||
|
|
|
@ -55,7 +55,7 @@ CVAR(Bool, use_mouse, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
||||||
|
|
||||||
CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
|
||||||
|
|
||||||
extern int paused, chatmodeon;
|
extern int paused;
|
||||||
extern bool ToggleFullscreen;
|
extern bool ToggleFullscreen;
|
||||||
bool GUICapture;
|
bool GUICapture;
|
||||||
|
|
||||||
|
|
|
@ -56,7 +56,7 @@ static bool NativeMouse = true;
|
||||||
CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||||
|
|
||||||
|
|
||||||
extern int WaitingForKey, chatmodeon;
|
extern int WaitingForKey;
|
||||||
|
|
||||||
static const SDL_Keycode DIKToKeySym[256] =
|
static const SDL_Keycode DIKToKeySym[256] =
|
||||||
{
|
{
|
||||||
|
|
|
@ -125,8 +125,6 @@ static bool EventHandlerResultForNativeMouse;
|
||||||
|
|
||||||
CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
CVAR (Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
|
||||||
|
|
||||||
extern int chatmodeon;
|
|
||||||
|
|
||||||
static void I_CheckGUICapture ()
|
static void I_CheckGUICapture ()
|
||||||
{
|
{
|
||||||
bool wantCapt = sysCallbacks.WantGuiCapture && sysCallbacks.WantGuiCapture();
|
bool wantCapt = sysCallbacks.WantGuiCapture && sysCallbacks.WantGuiCapture();
|
||||||
|
|
|
@ -65,8 +65,6 @@ void CT_Drawer ();
|
||||||
bool CT_Responder (event_t *ev);
|
bool CT_Responder (event_t *ev);
|
||||||
void CT_PasteChat(const char *clip);
|
void CT_PasteChat(const char *clip);
|
||||||
|
|
||||||
int chatmodeon;
|
|
||||||
|
|
||||||
// Private data
|
// Private data
|
||||||
|
|
||||||
static void CT_ClearChatMessage ();
|
static void CT_ClearChatMessage ();
|
||||||
|
|
|
@ -40,8 +40,6 @@ void CT_Init (void);
|
||||||
bool CT_Responder (event_t* ev);
|
bool CT_Responder (event_t* ev);
|
||||||
void CT_Drawer (void);
|
void CT_Drawer (void);
|
||||||
|
|
||||||
extern int chatmodeon;
|
|
||||||
|
|
||||||
// [RH] Draw deathmatch scores
|
// [RH] Draw deathmatch scores
|
||||||
|
|
||||||
void HU_DrawScores (player_t *me);
|
void HU_DrawScores (player_t *me);
|
||||||
|
|
Loading…
Reference in a new issue