OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Expose ConsoleState to scripts

Browse source 
- Make ConsoleState uint8_t sized
This commit is contained in:
nashmuhandes 2022-07-16 18:13:53 +08:00 • committed by Christoph Oelckers
commit c6ae73d6d2
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/common/console/c_console.cpp
View file

@ -104,7 +104,9 @@ bool vidactive = false;
bool cursoron = false;
int ConBottom, ConScroll, RowAdjust;
uint64_t CursorTicker;
constate_e ConsoleState = c_up;
uint8_t ConsoleState = c_up;
DEFINE_GLOBAL(ConsoleState)
static int TopLine, InsertLine;

7
src/common/console/c_console.h
View file

@ -41,11 +41,10 @@
struct event_t;
typedef enum cstate_t
enum cstate_t : uint8_t
{
c_up=0, c_down=1, c_falling=2, c_rising=3
}
constate_e;
};
enum
{
@ -53,7 +52,7 @@ enum
};
extern int PrintColors[PRINTLEVELS + 2];
extern constate_e ConsoleState;
extern uint8_t ConsoleState;
// Initialize the console
void C_InitConsole (int width, int height, bool ingame);

2
src/common/platform/posix/cocoa/i_input.mm
View file

@ -56,7 +56,7 @@ CVAR(Bool, use_mouse, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
CVAR(Bool, k_allowfullscreentoggle, true, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
extern int paused, chatmodeon;
extern constate_e ConsoleState;
extern uint8_t ConsoleState;
extern bool ToggleFullscreen;
bool GUICapture;

2
src/common/platform/posix/sdl/i_input.cpp
View file

@ -57,7 +57,7 @@ CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
extern int WaitingForKey, chatmodeon;
extern constate_e ConsoleState;
extern uint8_t ConsoleState;
static const SDL_Keycode DIKToKeySym[256] =
{