zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-22 03:41:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

- more work on console code.

Browse source
This commit is contained in:
Christoph Oelckers 2020-04-11 17:59:15 +02:00
parent 0b39911385
commit 4a50f78bfe
6 changed files with 219 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

254
src/console/c_bind.cpp
View file

@ -50,48 +50,45 @@
const char *KeyNames[NUM_KEYS] = const char *KeyNames[NUM_KEYS] =
{ {
// This array is dependant on the particular keyboard input // We use the DirectInput codes and assume a qwerty keyboard layout.
// codes generated in i_input.c. If they change there, they
// also need to change here. In this case, we use the
// DirectInput codes and assume a qwerty keyboard layout.
// See <dinput.h> for the DIK_* codes // See <dinput.h> for the DIK_* codes
NULL, "Escape", "1", "2", "3", "4", "5", "6", //00 nullptr, "Escape", "1", "2", "3", "4", "5", "6", //00
"7", "8", "9", "0", "-", "=", "Backspace","Tab", //08 "7", "8", "9", "0", "-", "=", "Backspace","Tab", //08
"Q", "W", "E", "R", "T", "Y", "U", "I", //10 "Q", "W", "E", "R", "T", "Y", "U", "I", //10
"O", "P", "[", "]", "Enter", "Ctrl", "A", "S", //18 "O", "P", "[", "]", "Enter", "LCtrl", "A", "S", //18
"D", "F", "G", "H", "J", "K", "L", ";", //20 "D", "F", "G", "H", "J", "K", "L", ";", //20
"'", "`", "Shift", "\\", "Z", "X", "C", "V", //28 "'", "`", "LShift", "\\", "Z", "X", "C", "V", //28
"B", "N", "M", ",", ".", "/", "RShift", "KP*", //30 "B", "N", "M", ",", ".", "/", "RShift", "KP*", //30
"Alt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", //38 "LAlt", "Space", "CapsLock", "F1", "F2", "F3", "F4", "F5", //38
"F6", "F7", "F8", "F9", "F10", "NumLock", "Scroll", "KP7", //40 "F6", "F7", "F8", "F9", "F10", "NumLock", "Scroll", "KP7", //40
"KP8", "KP9", "KP-", "KP4", "KP5", "KP6", "KP+", "KP1", //48 "KP8", "KP9", "KP-", "KP4", "KP5", "KP6", "KP+", "KP1", //48
"KP2", "KP3", "KP0", "KP.", NULL, NULL, "OEM102", "F11", //50 "KP2", "KP3", "KP0", "KP.", nullptr, nullptr, "OEM102", "F11", //50
"F12", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //58 "F12", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //58
NULL, NULL, NULL, NULL, "F13", "F14", "F15", "F16", //60 nullptr, nullptr, nullptr, nullptr, "F13", "F14", "F15", "F16", //60
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //68 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //68
"Kana", NULL, NULL, "Abnt_C1", NULL, NULL, NULL, NULL, //70 "Kana", nullptr, nullptr, "Abnt_C1", nullptr, nullptr, nullptr, nullptr, //70
NULL, "Convert", NULL, "NoConvert",NULL, "Yen", "Abnt_C2", NULL, //78 nullptr, "Convert", nullptr, "NoConvert",nullptr, "Yen", "Abnt_C2", nullptr, //78
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //80 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //80
NULL, NULL, NULL, NULL, NULL, "KP=", NULL, NULL, //88 nullptr, nullptr, nullptr, nullptr, nullptr, "KP=", nullptr, nullptr, //88
"Circumflex","@", ":", "_", "Kanji", "Stop", "Ax", "Unlabeled",//90 "Circumflex","@", ":", "_", "Kanji", "Stop", "Ax", "Unlabeled",//90
NULL, "PrevTrack",NULL, NULL, "KP-Enter", "RCtrl", NULL, NULL, //98 nullptr, "PrevTrack",nullptr, nullptr, "KP-Enter", "RCtrl", nullptr, nullptr, //98
"Mute", "Calculator","Play", NULL, "Stop", NULL, NULL, NULL, //A0 "Mute", "Calculator","Play", nullptr, "Stop", nullptr, nullptr, nullptr, //A0
NULL, NULL, NULL, NULL, NULL, NULL, "VolDown", NULL, //A8 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, "VolDown", nullptr, //A8
"VolUp", NULL, "WebHome", "KP,", NULL, "KP/", NULL, "SysRq", //B0 "VolUp", nullptr, "WebHome", "KP,", nullptr, "KP/", nullptr, "SysRq", //B0
"RAlt", NULL, NULL, NULL, NULL, NULL, NULL, NULL, //B8 "RAlt", nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //B8
NULL, NULL, NULL, NULL, NULL, "Pause", NULL, "Home", //C0 nullptr, nullptr, nullptr, nullptr, nullptr, "Pause", nullptr, "Home", //C0
"UpArrow", "PgUp", NULL, "LeftArrow",NULL, "RightArrow",NULL, "End", //C8 "UpArrow", "PgUp", nullptr, "LeftArrow",nullptr, "RightArrow",nullptr, "End", //C8
"DownArrow","PgDn", "Ins", "Del", NULL, NULL, NULL, NULL, //D0 "DownArrow","PgDn", "Ins", "Del", nullptr, nullptr, nullptr, nullptr, //D0
#ifdef __APPLE__ #ifdef __APPLE__
NULL, NULL, NULL, "Command", NULL, "Apps", "Power", "Sleep", //D8 nullptr, nullptr, nullptr, "Command", nullptr, "Apps", "Power", "Sleep", //D8
#else // !__APPLE__ #else // !__APPLE__
NULL, NULL, NULL, "LWin", "RWin", "Apps", "Power", "Sleep", //D8 nullptr, nullptr, nullptr, "LWin", "RWin", "Apps", "Power", "Sleep", //D8
#endif // __APPLE__ #endif // __APPLE__
NULL, NULL, NULL, "Wake", NULL, "Search", "Favorites","Refresh", //E0 nullptr, nullptr, nullptr, "Wake", nullptr, "Search", "Favorites","Refresh", //E0
"WebStop", "WebForward","WebBack", "MyComputer","Mail", "MediaSelect",NULL, NULL, //E8 "WebStop", "WebForward","WebBack", "MyComputer","Mail", "MediaSelect",nullptr, nullptr, //E8
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //F0 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //F0
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, //F8 nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, //F8
// non-keyboard buttons that can be bound // non-keyboard buttons that can be bound
"Mouse1", "Mouse2", "Mouse3", "Mouse4", // 8 mouse buttons "Mouse1", "Mouse2", "Mouse3", "Mouse4", // 8 mouse buttons
@ -156,11 +153,8 @@ FKeyBindings Bindings;
FKeyBindings DoubleBindings; FKeyBindings DoubleBindings;
FKeyBindings AutomapBindings; FKeyBindings AutomapBindings;
DEFINE_GLOBAL(Bindings)
DEFINE_GLOBAL(AutomapBindings)
static unsigned int DClickTime[NUM_KEYS]; static unsigned int DClickTime[NUM_KEYS];
static uint8_t DClicked[(NUM_KEYS+7)/8]; static FixedBitArray<NUM_KEYS> DClicked;
//============================================================================= //=============================================================================
// //
@ -224,7 +218,7 @@ static int GetConfigKeyFromName (const char *key)
// //
//============================================================================= //=============================================================================
static const char *KeyName (int key) const char *KeyName (int key)
{ {
static char name[5]; static char name[5];
@ -264,29 +258,6 @@ static const char *ConfigKeyName(int keynum)
// //
//============================================================================= //=============================================================================
DEFINE_ACTION_FUNCTION(FKeyBindings, SetBind)
{
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings);
PARAM_INT(k);
PARAM_STRING(cmd);
// Only menus are allowed to change bindings.
if (DMenu::InMenu == 0)
{
I_FatalError("Attempt to change key bindings outside of menu code to '%s'", cmd.GetChars());
}
self->SetBind(k, cmd);
return 0;
}
//=============================================================================
//
//
//
//=============================================================================
void C_NameKeys (char *str, int first, int second) void C_NameKeys (char *str, int first, int second)
{ {
int c = 0; int c = 0;
@ -311,14 +282,32 @@ void C_NameKeys (char *str, int first, int second)
*str = '\0'; *str = '\0';
} }
DEFINE_ACTION_FUNCTION(FKeyBindings, NameKeys) //=============================================================================
//
//
//
//=============================================================================
FString C_NameKeys (int *keys, int count, bool colors)
{ {
PARAM_PROLOGUE; FString result;
PARAM_INT(k1); for (int i = 0; i < count; i++)
PARAM_INT(k2); {
char buffer[120]; int key = keys[i];
C_NameKeys(buffer, k1, k2); if (key == 0) continue;
ACTION_RETURN_STRING(buffer); for (int j = 0; j < i; j++)
{
if (key == keys[j])
{
key = 0;
break;
}
}
if (key == 0) continue;
if (result.IsNotEmpty()) result += colors? TEXTCOLOR_BLACK ", " TEXTCOLOR_NORMAL : ", ";
result += KeyName(key);
}
return result;
} }
//============================================================================= //=============================================================================
@ -414,11 +403,11 @@ void FKeyBindings::PerformBind(FCommandLine &argv, const char *msg)
//============================================================================= //=============================================================================
// //
// This function is first called for functions in custom key sections. // This function is first called for functions in custom key sections.
// In this case, matchcmd is non-NULL, and only keys bound to that command // In this case, matchcmd is non-null, and only keys bound to that command
// are stored. If a match is found, its binding is set to "\1". // are stored. If a match is found, its binding is set to "\1".
// After all custom key sections are saved, it is called one more for the // After all custom key sections are saved, it is called one more for the
// normal Bindings and DoubleBindings sections for this game. In this case // normal Bindings and DoubleBindings sections for this game. In this case
// matchcmd is NULL and all keys will be stored. The config section was not // matchcmd is null and all keys will be stored. The config section was not
// previously cleared, so all old bindings are still in place. If the binding // previously cleared, so all old bindings are still in place. If the binding
// for a key is empty, the corresponding key in the config is removed as well. // for a key is empty, the corresponding key in the config is removed as well.
// If a binding is "\1", then the binding itself is cleared, but nothing // If a binding is "\1", then the binding itself is cleared, but nothing
@ -434,12 +423,12 @@ void FKeyBindings::ArchiveBindings(FConfigFile *f, const char *matchcmd)
{ {
if (Binds[i].IsEmpty()) if (Binds[i].IsEmpty())
{ {
if (matchcmd == NULL) if (matchcmd == nullptr)
{ {
f->ClearKey(ConfigKeyName(i)); f->ClearKey(ConfigKeyName(i));
} }
} }
else if (matchcmd == NULL || stricmp(Binds[i], matchcmd) == 0) else if (matchcmd == nullptr || stricmp(Binds[i], matchcmd) == 0)
{ {
if (Binds[i][0] == '\1') if (Binds[i][0] == '\1')
{ {
@ -447,7 +436,7 @@ void FKeyBindings::ArchiveBindings(FConfigFile *f, const char *matchcmd)
continue; continue;
} }
f->SetValueForKey(ConfigKeyName(i), Binds[i]); f->SetValueForKey(ConfigKeyName(i), Binds[i]);
if (matchcmd != NULL) if (matchcmd != nullptr)
{ // If saving a specific command, set a marker so that { // If saving a specific command, set a marker so that
// it does not get saved in the general binding list. // it does not get saved in the general binding list.
Binds[i] = "\1"; Binds[i] = "\1";
@ -482,15 +471,26 @@ int FKeyBindings::GetKeysForCommand (const char *cmd, int *first, int *second)
return c; return c;
} }
DEFINE_ACTION_FUNCTION(FKeyBindings, GetKeysForCommand) //=============================================================================
//
//
//
//=============================================================================
TArray<int> FKeyBindings::GetKeysForCommand (const char *cmd)
{ {
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings); int i = 0;
PARAM_STRING(cmd); TArray<int> result;
int k1, k2;
self->GetKeysForCommand(cmd.GetChars(), &k1, &k2); while (i < NUM_KEYS)
if (numret > 0) ret[0].SetInt(k1); {
if (numret > 1) ret[1].SetInt(k2); if (stricmp (cmd, Binds[i]) == 0)
return MIN(numret, 2); {
result.Push(i);
}
i++;
}
return result;
} }
//============================================================================= //=============================================================================
@ -512,21 +512,6 @@ void FKeyBindings::UnbindACommand (const char *str)
} }
} }
DEFINE_ACTION_FUNCTION(FKeyBindings, UnbindACommand)
{
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings);
PARAM_STRING(cmd);
// Only menus are allowed to change bindings.
if (DMenu::InMenu == 0)
{
I_FatalError("Attempt to unbind key bindings for '%s' outside of menu code", cmd.GetChars());
}
self->UnbindACommand(cmd);
return 0;
}
//============================================================================= //=============================================================================
// //
// //
@ -652,20 +637,20 @@ CCMD (defaultbind)
// //
//============================================================================= //=============================================================================
CCMD (rebind) CCMD(rebind)
{ {
FKeyBindings *bindings; FKeyBindings* bindings;
if (key == 0) if (key == 0)
{ {
Printf ("Rebind cannot be used from the console\n"); Printf("Rebind cannot be used from the console\n");
return; return;
} }
if (key & KEY_DBLCLICKED) if (key & KEY_DBLCLICKED)
{ {
bindings = &DoubleBindings; bindings = &DoubleBindings;
key &= KEY_DBLCLICKED-1; key &= KEY_DBLCLICKED - 1;
} }
else else
{ {
@ -684,38 +669,49 @@ CCMD (rebind)
// //
//============================================================================= //=============================================================================
void ReadBindings(int lump, bool override)
{
FScanner sc(lump);
while (sc.GetString())
{
FKeyBindings* dest = &Bindings;
int key;
// bind destination is optional and is the same as the console command
if (sc.Compare("bind"))
{
sc.MustGetString();
}
else if (sc.Compare("doublebind"))
{
dest = &DoubleBindings;
sc.MustGetString();
}
else if (sc.Compare("mapbind"))
{
dest = &AutomapBindings;
sc.MustGetString();
}
key = GetConfigKeyFromName(sc.String);
sc.MustGetString();
dest->SetBind(key, sc.String, override);
}
}
//=============================================================================
//
//
//
//=============================================================================
void C_BindDefaults () void C_BindDefaults ()
{ {
int lump, lastlump = 0; int lump, lastlump = 0;
while ((lump = fileSystem.FindLump("DEFBINDS", &lastlump)) != -1) while ((lump = fileSystem.FindLump("DEFBINDS", &lastlump)) != -1)
{ {
FScanner sc(lump); ReadBindings(lump, false);
while (sc.GetString())
{
FKeyBindings *dest = &Bindings;
int key;
// bind destination is optional and is the same as the console command
if (sc.Compare("bind"))
{
sc.MustGetString();
}
else if (sc.Compare("doublebind"))
{
dest = &DoubleBindings;
sc.MustGetString();
}
else if (sc.Compare("mapbind"))
{
dest = &AutomapBindings;
sc.MustGetString();
}
key = GetConfigKeyFromName(sc.String);
sc.MustGetString();
dest->SetBind(key, sc.String);
}
} }
} }
@ -740,8 +736,6 @@ bool C_DoKey (event_t *ev, FKeyBindings *binds, FKeyBindings *doublebinds)
{ {
FString binding; FString binding;
bool dclick; bool dclick;
int dclickspot;
uint8_t dclickmask;
unsigned int nowtime; unsigned int nowtime;
if (ev->type != EV_KeyDown && ev->type != EV_KeyUp) if (ev->type != EV_KeyDown && ev->type != EV_KeyUp)
@ -750,16 +744,14 @@ bool C_DoKey (event_t *ev, FKeyBindings *binds, FKeyBindings *doublebinds)
if ((unsigned int)ev->data1 >= NUM_KEYS) if ((unsigned int)ev->data1 >= NUM_KEYS)
return false; return false;
dclickspot = ev->data1 >> 3;
dclickmask = 1 << (ev->data1 & 7);
dclick = false; dclick = false;
nowtime = (unsigned)I_msTime(); nowtime = (unsigned)I_msTime();
if (doublebinds != NULL && int(DClickTime[ev->data1] - nowtime) > 0 && ev->type == EV_KeyDown) if (doublebinds != nullptr && int(DClickTime[ev->data1] - nowtime) > 0 && ev->type == EV_KeyDown)
{ {
// Key pressed for a double click // Key pressed for a double click
binding = doublebinds->GetBinding(ev->data1); binding = doublebinds->GetBinding(ev->data1);
DClicked[dclickspot] |= dclickmask; DClicked.Set(ev->data1);
dclick = true; dclick = true;
} }
else else
@ -769,10 +761,10 @@ bool C_DoKey (event_t *ev, FKeyBindings *binds, FKeyBindings *doublebinds)
binding = binds->GetBinding(ev->data1); binding = binds->GetBinding(ev->data1);
DClickTime[ev->data1] = nowtime + 571; DClickTime[ev->data1] = nowtime + 571;
} }
else if (doublebinds != NULL && DClicked[dclickspot] & dclickmask) else if (doublebinds != nullptr && DClicked[ev->data1])
{ // Key released from a double click { // Key released from a double click
binding = doublebinds->GetBinding(ev->data1); binding = doublebinds->GetBinding(ev->data1);
DClicked[dclickspot] &= ~dclickmask; DClicked.Clear(ev->data1);
DClickTime[ev->data1] = 0; DClickTime[ev->data1] = 0;
dclick = true; dclick = true;
} }

14
src/console/c_bind.h
View file

@ -51,14 +51,16 @@ public:
bool DoKey(event_t *ev); bool DoKey(event_t *ev);
void ArchiveBindings(FConfigFile *F, const char *matchcmd = NULL); void ArchiveBindings(FConfigFile *F, const char *matchcmd = NULL);
int GetKeysForCommand (const char *cmd, int *first, int *second); int GetKeysForCommand (const char *cmd, int *first, int *second);
TArray<int> GetKeysForCommand (const char *cmd);
void UnbindACommand (const char *str); void UnbindACommand (const char *str);
void UnbindAll (); void UnbindAll ();
void UnbindKey(const char *key); void UnbindKey(const char *key);
void DoBind (const char *key, const char *bind); void DoBind (const char *key, const char *bind);
void DefaultBind(const char *keyname, const char *cmd); void DefaultBind(const char *keyname, const char *cmd);
void SetBind(unsigned int key, const char *bind) void SetBind(unsigned int key, const char *bind, bool override = true)
{ {
if (!override && Binds[key].IsNotEmpty()) return;
if (key < NUM_KEYS) Binds[key] = bind; if (key < NUM_KEYS) Binds[key] = bind;
} }
@ -69,8 +71,12 @@ public:
const char *GetBind(unsigned int index) const const char *GetBind(unsigned int index) const
{ {
if (index < NUM_KEYS) return Binds[index].GetChars(); if (index < NUM_KEYS)
else return NULL; {
auto c = Binds[index].GetChars();
if (*c) return c;
}
return NULL;
} }
}; };
@ -86,6 +92,7 @@ bool C_DoKey (event_t *ev, FKeyBindings *binds, FKeyBindings *doublebinds);
// Stuff used by the customize controls menu // Stuff used by the customize controls menu
void C_SetDefaultBindings (); void C_SetDefaultBindings ();
void C_UnbindAll (); void C_UnbindAll ();
void C_NameKeys(char* str, int first, int second);
extern const char *KeyNames[]; extern const char *KeyNames[];
@ -104,3 +111,4 @@ struct FKeySection
extern TArray<FKeySection> KeySections; extern TArray<FKeySection> KeySections;
#endif //__C_BINDINGS_H__ #endif //__C_BINDINGS_H__

16
src/console/c_console.cpp
View file

@ -293,7 +293,7 @@ public:
{ // The cursor is in front of the visible part of the line { // The cursor is in front of the visible part of the line
n = CursorPosCells; n = CursorPosCells;
} }
StartPosCells = MAX(0, n); StartPosCells = std::max(0, n);
bool overflow; bool overflow;
StartPos = CharsForCells(StartPosCells, &overflow); StartPos = CharsForCells(StartPosCells, &overflow);
if (overflow) if (overflow)
@ -887,9 +887,14 @@ void WriteLineToLog(FILE *LogFile, const char *outline)
fflush(LogFile); fflush(LogFile);
} }
extern bool gameisdead;
int PrintString (int iprintlevel, const char *outline) int PrintString (int iprintlevel, const char *outline)
{ {
if (gameisdead)
return 0;
if (!conbuffer) return 0; // when called too early
int printlevel = iprintlevel & PRINT_TYPES; int printlevel = iprintlevel & PRINT_TYPES;
if (printlevel < msglevel || *outline == '\0') if (printlevel < msglevel || *outline == '\0')
{ {
@ -920,13 +925,8 @@ int PrintString (int iprintlevel, const char *outline)
return 0; // Don't waste time on calculating this if nothing at all was printed... return 0; // Don't waste time on calculating this if nothing at all was printed...
} }
extern bool gameisdead;
int VPrintf (int printlevel, const char *format, va_list parms) int VPrintf (int printlevel, const char *format, va_list parms)
{ {
if (gameisdead)
return 0;
FString outline; FString outline;
outline.VFormat (format, parms); outline.VFormat (format, parms);
return PrintString (printlevel, outline.GetChars()); return PrintString (printlevel, outline.GetChars());
@ -1425,7 +1425,7 @@ static bool C_HandleKey (event_t *ev, FCommandBuffer &buffer)
{ // Scroll console buffer down { // Scroll console buffer down
if (ev->subtype == EV_GUI_WheelDown) if (ev->subtype == EV_GUI_WheelDown)
{ {
RowAdjust = MAX (0, RowAdjust - 3); RowAdjust = std::max (0, RowAdjust - 3);
} }
else else
{ {
@ -2030,7 +2030,7 @@ static bool C_TabCompleteList ()
} }
} }
nummatches++; nummatches++;
maxwidth = MAX (maxwidth, strlen (TabCommands[i].TabName.GetChars())); maxwidth = std::max (maxwidth, strlen (TabCommands[i].TabName.GetChars()));
} }
} }
if (nummatches > 1) if (nummatches > 1)

1
src/console/c_consolebuffer.cpp
View file

@ -35,6 +35,7 @@
#include "c_console.h" #include "c_console.h"
#include "c_consolebuffer.h" #include "c_consolebuffer.h"
#include "printf.h"
//========================================================================== //==========================================================================

64
src/scripting/vmthunks.cpp
View file

@ -54,6 +54,7 @@
#include "intermission/intermission.h" #include "intermission/intermission.h"
#include "menu/menu.h" #include "menu/menu.h"
#include "c_cvars.h" #include "c_cvars.h"
#include "c_bind.h"
DVector2 AM_GetPosition(); DVector2 AM_GetPosition();
int Net_GetLatency(int *ld, int *ad); int Net_GetLatency(int *ld, int *ad);
@ -3333,6 +3334,66 @@ DEFINE_ACTION_FUNCTION(_CVar, GetCVar)
ACTION_RETURN_POINTER(GetCVar(plyr ? int(plyr - players) : -1, name.GetChars())); ACTION_RETURN_POINTER(GetCVar(plyr ? int(plyr - players) : -1, name.GetChars()));
} }
//=============================================================================
//
//
//
//=============================================================================
DEFINE_ACTION_FUNCTION(FKeyBindings, SetBind)
{
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings);
PARAM_INT(k);
PARAM_STRING(cmd);
// Only menus are allowed to change bindings.
if (DMenu::InMenu == 0)
{
I_FatalError("Attempt to change key bindings outside of menu code to '%s'", cmd.GetChars());
}
self->SetBind(k, cmd);
return 0;
}
DEFINE_ACTION_FUNCTION(FKeyBindings, NameKeys)
{
PARAM_PROLOGUE;
PARAM_INT(k1);
PARAM_INT(k2);
char buffer[120];
C_NameKeys(buffer, k1, k2);
ACTION_RETURN_STRING(buffer);
}
DEFINE_ACTION_FUNCTION(FKeyBindings, GetKeysForCommand)
{
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings);
PARAM_STRING(cmd);
int k1, k2;
self->GetKeysForCommand(cmd.GetChars(), &k1, &k2);
if (numret > 0) ret[0].SetInt(k1);
if (numret > 1) ret[1].SetInt(k2);
return MIN(numret, 2);
}
DEFINE_ACTION_FUNCTION(FKeyBindings, UnbindACommand)
{
PARAM_SELF_STRUCT_PROLOGUE(FKeyBindings);
PARAM_STRING(cmd);
// Only menus are allowed to change bindings.
if (DMenu::InMenu == 0)
{
I_FatalError("Attempt to unbind key bindings for '%s' outside of menu code", cmd.GetChars());
}
self->UnbindACommand(cmd);
return 0;
}
@ -3515,3 +3576,6 @@ DEFINE_FIELD(DBaseStatusBar, itemflashFade);
DEFINE_FIELD(DHUDFont, mFont); DEFINE_FIELD(DHUDFont, mFont);
DEFINE_GLOBAL(StatusBar); DEFINE_GLOBAL(StatusBar);
DEFINE_GLOBAL(Bindings)
DEFINE_GLOBAL(AutomapBindings)

13
src/sound/s_environment.cpp
View file

@ -184,9 +184,20 @@ static ReverbContainer Underwater =
false false
}; };
static ReverbContainer SewerPipe = static ReverbContainer SewerPipe4 =
{ {
&Underwater, &Underwater,
"Sewer Pipe 2",
0x1503,
true,
false,
{0,21, 1.7f, 0.80f, -1000, -1000, 0, 1.81f, 0.14f, 1.0f, 229, 0.014f, 0.0f,0.0f,0.0f, 1023, 0.021f, 0.0f,0.0f,0.0f, 0.250f, 0.00f, 0.25f, 0.000f, -5.0f, 5000.0f, 250.0f, 0.0f, 80.0f, 60.0f, 0x3f },
false
};
static ReverbContainer SewerPipe =
{
&SewerPipe4,
"Sewer Pipe", "Sewer Pipe",
0x1500, 0x1500,
true, true,