diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 53e8656b6ca39ccc2d027731b5e1e037a01afe6b..5315b351b7aa8d4999688a60b5cd9c456d65ee37 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
uses
g_textures, g_main, e_graphics, e_input, g_game, g_gfx, g_player, g_items,
SysUtils, g_basic, g_options, Math, g_touch, e_res,
- g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons;
+ g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons,
+ Keyboard;
const
autoexecScript = 'autoexec.cfg';
ChatTop: BOOLEAN;
ConsoleStep: Single;
ConsoleTrans: Single;
+ ConsoleStdIn: Boolean;
procedure g_Console_Switch;
end
end;
+procedure ReadStdIn;
+var
+ K: Char;
+ KEv: TKeyEvent;
+begin
+ gConsoleShow := True;
+ InputReady := True;
+ // one key per frame
+ KEv := PollKeyEvent();
+ if KEv <> 0 then
+ begin
+ K := GetKeyEventChar(TranslateKeyEvent(GetKeyEvent()));
+ Write(K);
+ case K of
+ #8: g_Console_Control(IK_BACKSPACE);
+ #10, #13: g_Console_Control(IK_RETURN);
+ #32..#126: g_Console_Char(K);
+ // arrow keys and DEL all return 0 for some reason, so fuck em
+ end;
+ end;
+end;
+
procedure g_Console_SysInit;
var a: Integer;
begin
AddCommand('g_warmup_time', GameCVars);
AddCommand('g_spawn_invul', GameCVars);
AddCommand('g_item_respawn_time', GameCVars);
+ AddCommand('g_item_time_random', GameCVars);
+ AddCommand('g_items_all_respawn_random', GameCVars);
+ AddCommand('g_items_help_respawn_random', GameCVars);
+ AddCommand('g_items_ammo_respawn_random', GameCVars);
+ AddCommand('g_items_weapon_respawn_random', GameCVars);
+ AddCommand('g_powerup_randomize_respawn', GameCVars);
+ AddCommand('g_powerup_respawn_time', GameCVars);
+ AddCommand('g_powerup_time_random', GameCVars);
AddCommand('sv_intertime', GameCVars);
AddCommand('sv_name', NetServerCVars);
WhitelistCommand('g_warmup_time');
WhitelistCommand('g_spawn_invul');
WhitelistCommand('g_item_respawn_time');
+ WhitelistCommand('g_item_time_random');
+ WhitelistCommand('g_items_all_respawn_random');
+ WhitelistCommand('g_items_help_respawn_random');
+ WhitelistCommand('g_items_ammo_respawn_random');
+ WhitelistCommand('g_items_weapon_respawn_random');
+ WhitelistCommand('g_powerup_randomize_respawn');
+ WhitelistCommand('g_powerup_respawn_time');
+ WhitelistCommand('g_powerup_time_random');
g_Console_ResetBinds;
g_Console_ReadConfig(gConfigScript);
g_Texture_CreateWAD(ID, GameWAD+':TEXTURES\CONSOLE');
g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION]));
g_Console_Add('');
+{$IFDEF HEADLESS}
+ if ConsoleStdIn then
+ begin
+ InitKeyboard();
+ conbufStdOutRawMode := true;
+ end;
+{$ENDIF}
end;
procedure g_Console_Update;
var
a, b, Step: Integer;
begin
+{$IFDEF HEADLESS}
+ if ConsoleStdIn then
+ ReadStdIn();
+{$ENDIF}
+
if Cons_Shown then
begin
Step := Max(1, Round(Floor(gScreenHeight * ConsoleHeight) * ConsoleStep));
WriteLn(f, 'g_timelimit ', gsTimeLimit);
WriteLn(f, 'g_maxlives ', gsMaxLives);
WriteLn(f, 'g_item_respawn_time ', gsItemRespawnTime);
+ WriteLn(f, 'g_item_time_random ', gsItemRespawnRandom);
+ WriteLn(f, 'g_powerup_respawn_time ', gsRulezRespawnTime);
+ WriteLn(f, 'g_powerup_time_random ', gsRulezRespawnRandom);
WriteLn(f, 'g_spawn_invul ', gsSpawnInvul);
WriteLn(f, 'g_warmup_time ', gsWarmupTime);
WriteFlag('g_friendlyfire ', GAME_OPTION_TEAMDAMAGE);
WriteFlag('g_friendly_hit_trace ', GAME_OPTION_TEAMHITTRACE);
WriteFlag('g_friendly_hit_projectile ', GAME_OPTION_TEAMHITPROJECTILE);
+ WriteFlag('g_powerup_randomize_respawn ', GAME_OPTION_RULEZRANDOM);
+ WriteFlag('g_items_all_respawn_random ', GAME_OPTION_ITEMALLRANDOM);
+ WriteFlag('g_items_help_respawn_random ', GAME_OPTION_ITEMHELPRANDOM);
+ WriteFlag('g_items_ammo_respawn_random ', GAME_OPTION_ITEMAMMORANDOM);
+ WriteFlag('g_items_weapon_respawn_random ', GAME_OPTION_ITEMWEAPONRANDOM);
WriteFlag('g_allow_exit ', GAME_OPTION_ALLOWEXIT);
WriteFlag('g_allow_monsters ', GAME_OPTION_MONSTERS);
WriteFlag('g_allow_dropflag ', GAME_OPTION_ALLOWDROPFLAG);
conRegVar('console_height', @ConsoleHeight, 0.0, 1.0, 'set console size', 'set console size');
conRegVar('console_trans', @ConsoleTrans, 0.0, 1.0, 'set console transparency', 'set console transparency');
conRegVar('console_step', @ConsoleStep, 0.0, 1.0, 'set console animation speed', 'set console animation speed');
+ conRegVar('console_stdin', @ConsoleStdIn, 'enable reading commands from stdin', 'enable reading commands from stdin');
{$IFDEF ANDROID}
ChatTop := True;
ConsoleHeight := 0.35;
{$ENDIF}
ConsoleTrans := 0.1;
ConsoleStep := 0.07;
+{$IFDEF HEADLESS}
+ ConsoleStdIn := True;
+{$ELSE}
+ ConsoleStdIn := False;
+{$ENDIF}
conRegVar('d_eres', @debug_e_res, '', '');
for i := 1 to e_MaxJoys do
conRegVar('joy' + IntToStr(i) + '_deadzone', @e_JoystickDeadzones[i - 1], '', '')
initialization
Init
+
+{$IFDEF HEADLESS}
+finalization
+ DoneKeyboard;
+ conbufStdOutRawMode := false;
+{$ENDIF}
+
end.