X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=f7998c78544fed57150e8bebd5d64513c5900d32;hb=HEAD;hp=bbbd1c2024df8a367eff8f7beb22a575c427ba83;hpb=dac16ad95bb1fcf32130e3d6f7a301e63ba85ab0;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index bbbd1c2..f7998c7 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -30,11 +30,9 @@ uses ACTION_SCORES = 6; ACTION_ACTIVATE = 7; ACTION_STRAFE = 8; - ACTION_WEAPNEXT = 9; - ACTION_WEAPPREV = 10; FIRST_ACTION = ACTION_JUMP; - LAST_ACTION = ACTION_WEAPPREV; + LAST_ACTION = ACTION_STRAFE; procedure g_Console_Init; procedure g_Console_SysInit; @@ -54,7 +52,7 @@ function g_Console_Interactive: Boolean; function g_Console_Action (action: Integer): Boolean; function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean; function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer; -procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''); +procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False); procedure g_Console_ProcessBind (key: Integer; down: Boolean); procedure g_Console_ProcessBindRepeat (key: Integer); procedure g_Console_ResetBinds; @@ -76,7 +74,11 @@ function conGetBoolArg (p: SSArray; idx: Integer): Integer; function conParseFloat (var res: Single; const s: AnsiString): Boolean; const - defaultConfigScript = 'dfconfig.cfg'; + {$IFDEF HEADLESS} + defaultConfigScript = 'dfserver.cfg'; + {$ELSE} + defaultConfigScript = 'dfconfig.cfg'; + {$ENDIF} var gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ @@ -93,7 +95,8 @@ implementation 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_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf, g_weapons, + Keyboard; const autoexecScript = 'autoexec.cfg'; @@ -160,6 +163,7 @@ var ChatTop: BOOLEAN; ConsoleStep: Single; ConsoleTrans: Single; + ConsoleStdIn: Boolean; procedure g_Console_Switch; @@ -961,6 +965,28 @@ begin 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 @@ -1032,25 +1058,73 @@ begin AddCommand('p2_color', PlayerSettingsCVars); AddCommand('p1_model', PlayerSettingsCVars); AddCommand('p2_model', PlayerSettingsCVars); + AddCommand('p1_team', PlayerSettingsCVars); + AddCommand('p2_team', PlayerSettingsCVars); + AddCommand('p1_autoswitch', PlayerSettingsCVars); + AddCommand('p2_autoswitch', PlayerSettingsCVars); + AddCommand('p1_switch_empty', PlayerSettingsCVars); + AddCommand('p2_switch_empty', PlayerSettingsCVars); + AddCommand('p1_skip_ironfist', PlayerSettingsCVars); + AddCommand('p2_skip_ironfist', PlayerSettingsCVars); + AddCommand('p1_priority_ironfist', PlayerSettingsCVars); + AddCommand('p2_priority_ironfist', PlayerSettingsCVars); + AddCommand('p1_priority_saw', PlayerSettingsCVars); + AddCommand('p2_priority_saw', PlayerSettingsCVars); + AddCommand('p1_priority_pistol', PlayerSettingsCVars); + AddCommand('p2_priority_pistol', PlayerSettingsCVars); + AddCommand('p1_priority_shotgun1', PlayerSettingsCVars); + AddCommand('p2_priority_shotgun1', PlayerSettingsCVars); + AddCommand('p1_priority_shotgun2', PlayerSettingsCVars); + AddCommand('p2_priority_shotgun2', PlayerSettingsCVars); + AddCommand('p1_priority_chaingun', PlayerSettingsCVars); + AddCommand('p2_priority_chaingun', PlayerSettingsCVars); + AddCommand('p1_priority_rocketlauncher', PlayerSettingsCVars); + AddCommand('p2_priority_rocketlauncher', PlayerSettingsCVars); + AddCommand('p1_priority_plasma', PlayerSettingsCVars); + AddCommand('p2_priority_plasma', PlayerSettingsCVars); + AddCommand('p1_priority_bfg', PlayerSettingsCVars); + AddCommand('p2_priority_bfg', PlayerSettingsCVars); + AddCommand('p1_priority_superchaingun', PlayerSettingsCVars); + AddCommand('p2_priority_superchaingun', PlayerSettingsCVars); + AddCommand('p1_priority_flamethrower', PlayerSettingsCVars); + AddCommand('p2_priority_flamethrower', PlayerSettingsCVars); + AddCommand('p1_priority_berserk', PlayerSettingsCVars); + AddCommand('p2_priority_berserk', PlayerSettingsCVars); AddCommand('g_max_particles', GameCVars); AddCommand('g_max_shells', GameCVars); AddCommand('g_max_gibs', GameCVars); AddCommand('g_max_corpses', GameCVars); + AddCommand('g_force_model', GameCVars); + AddCommand('g_force_model_name', GameCVars); AddCommand('g_gamemode', GameCVars); AddCommand('g_friendlyfire', GameCVars); + AddCommand('g_friendly_hit_trace', GameCVars); + AddCommand('g_friendly_hit_projectile', GameCVars); + AddCommand('g_friendly_absorb_damage', GameCVars); AddCommand('g_weaponstay', GameCVars); AddCommand('g_allow_exit', GameCVars); AddCommand('g_dm_keys', GameCVars); AddCommand('g_allow_monsters', GameCVars); + AddCommand('g_allow_dropflag', GameCVars); + AddCommand('g_throw_flag', GameCVars); AddCommand('g_bot_vsmonsters', GameCVars); AddCommand('g_bot_vsplayers', GameCVars); + AddCommand('g_max_bots', GameCVars); // intentionally not whitelisted AddCommand('g_scorelimit', GameCVars); AddCommand('g_timelimit', GameCVars); AddCommand('g_maxlives', GameCVars); 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); @@ -1070,6 +1144,8 @@ begin AddCommand('bot_removeall', GameCommands); AddCommand('chat', GameCommands); AddCommand('teamchat', GameCommands); + AddCommand('announce', GameCommands); + AddCommand('an', GameCommands); AddCommand('game', GameCommands); AddCommand('host', GameCommands); AddCommand('map', GameCommands); @@ -1104,9 +1180,20 @@ begin AddCommand('clientlist', GameCommands); AddCommand('event', GameCommands); AddCommand('screenshot', GameCommands); + AddCommand('weapnext', GameCommands); + AddCommand('weapprev', GameCommands); AddCommand('weapon', GameCommands); + AddCommand('dropflag', GameCommands); + AddCommand('p1_weapnext', GameCommands); + AddCommand('p1_weapprev', GameCommands); AddCommand('p1_weapon', GameCommands); + AddCommand('p1_weapbest', GameCommands); + AddCommand('p1_dropflag', GameCommands); + AddCommand('p2_weapnext', GameCommands); + AddCommand('p2_weapprev', GameCommands); AddCommand('p2_weapon', GameCommands); + AddCommand('p2_weapbest', GameCommands); + AddCommand('p2_dropflag', GameCommands); AddCommand('god', GameCheats); AddCommand('notarget', GameCheats); @@ -1129,8 +1216,6 @@ begin AddAction('scores', ACTION_SCORES); AddAction('activate', ACTION_ACTIVATE); AddAction('strafe', ACTION_STRAFE); - AddAction('weapnext', ACTION_WEAPNEXT); - AddAction('weapprev', ACTION_WEAPPREV); WhitelistCommand('say'); WhitelistCommand('tell'); @@ -1154,6 +1239,9 @@ begin WhitelistCommand('g_gamemode'); WhitelistCommand('g_friendlyfire'); + WhitelistCommand('g_friendly_hit_trace'); + WhitelistCommand('g_friendly_hit_projectile'); + WhitelistCommand('g_friendly_absorb_damage'); WhitelistCommand('g_weaponstay'); WhitelistCommand('g_allow_exit'); WhitelistCommand('g_dm_keys'); @@ -1166,6 +1254,14 @@ begin 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); @@ -1178,12 +1274,24 @@ begin 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)); @@ -1844,14 +1952,14 @@ begin Result := gConsoleShow end; -procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''); +procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''; rep: Boolean = False); begin //e_LogWritefln('bind "%s" "%s" <%s>', [LowerCase(e_KeyNames[key]), cmd, key]); ASSERT(key >= 0); ASSERT(key < e_MaxInputKeys); if key > 0 then begin - gInputBinds[key].rep := False; + gInputBinds[key].rep := rep; gInputBinds[key].down := ParseAlias(down); gInputBinds[key].up := ParseAlias(up); end; @@ -1889,10 +1997,13 @@ begin i := 0; while (n >= 1) and (i < e_MaxInputKeys) do begin - if g_Console_MatchBind(i, down, up) then + if (i < VK_FIRSTKEY) or (i > VK_LASTKEY) then (* never show virtual keys in gui *) begin - result := i; - dec(n) + if g_Console_MatchBind(i, down, up) then + begin + result := i; + dec(n) + end; end; inc(i) end; @@ -1977,9 +2088,10 @@ begin g_Console_BindKey(IK_SPACE, '+p1_jump', '-p1_jump'); g_Console_BindKey(IK_H, '+p1_attack', '-p1_attack'); g_Console_BindKey(IK_J, '+p1_activate', '-p1_activate'); - g_Console_BindKey(IK_E, '+p1_weapnext', '-p1_weapnext'); - g_Console_BindKey(IK_Q, '+p1_weapprev', '-p1_weapprev'); g_Console_BindKey(IK_ALT, '+p1_strafe', '-p1_strafe'); + g_Console_BindKey(IK_E, 'p1_weapnext', '', True); + g_Console_BindKey(IK_Q, 'p1_weapprev', '', True); + g_Console_BindKey(IK_R, 'p1_dropflag', ''); g_Console_BindKey(IK_1, 'p1_weapon 1'); g_Console_BindKey(IK_2, 'p1_weapon 2'); g_Console_BindKey(IK_3, 'p1_weapon 3'); @@ -1994,7 +2106,7 @@ begin g_Console_BindKey(IK_T, 'togglechat'); g_Console_BindKey(IK_Y, 'toggleteamchat'); g_Console_BindKey(IK_F11, 'screenshot'); - g_Console_BindKey(IK_TAB, '+p1_scores', '-p1_scores'); + g_Console_BindKey(IK_TAB, '+scores', '-scores'); g_Console_BindKey(IK_PAUSE, 'pause'); g_Console_BindKey(IK_F1, 'vote'); @@ -2008,9 +2120,9 @@ begin g_Console_BindKey(e_JoyButtonToKey(i, 2), '+p' + IntToStr(i mod 2 + 1) + '_jump', '-p' + IntToStr(i mod 2 + 1) + '_jump'); g_Console_BindKey(e_JoyButtonToKey(i, 0), '+p' + IntToStr(i mod 2 + 1) + '_attack', '-p' + IntToStr(i mod 2 + 1) + '_attack'); g_Console_BindKey(e_JoyButtonToKey(i, 3), '+p' + IntToStr(i mod 2 + 1) + '_activate', '-p' + IntToStr(i mod 2 + 1) + '_activate'); - g_Console_BindKey(e_JoyButtonToKey(i, 1), '+p' + IntToStr(i mod 2 + 1) + '_weapnext', '-p' + IntToStr(i mod 2 + 1) + '_weapnext'); - g_Console_BindKey(e_JoyButtonToKey(i, 4), '+p' + IntToStr(i mod 2 + 1) + '_weapprev', '-p' + IntToStr(i mod 2 + 1) + '_weapprev'); g_Console_BindKey(e_JoyButtonToKey(i, 7), '+p' + IntToStr(i mod 2 + 1) + '_strafe', '-p' + IntToStr(i mod 2 + 1) + '_strafe'); + g_Console_BindKey(e_JoyButtonToKey(i, 1), 'p' + IntToStr(i mod 2 + 1) + '_weapnext', '', True); + g_Console_BindKey(e_JoyButtonToKey(i, 4), 'p' + IntToStr(i mod 2 + 1) + '_weapprev', '', True); g_Console_BindKey(e_JoyButtonToKey(i, 10), 'togglemenu'); end; @@ -2024,9 +2136,9 @@ begin g_Console_BindKey(VK_JUMP, '+jump', '-jump'); g_Console_BindKey(VK_FIRE, '+attack', '-attack'); g_Console_BindKey(VK_OPEN, '+activate', '-activate'); - g_Console_BindKey(VK_NEXT, '+weapnext', '-weapnext'); - g_Console_BindKey(VK_PREV, '+weapprev', '-weapprev'); g_Console_BindKey(VK_STRAFE, '+strafe', '-strafe'); + g_Console_BindKey(VK_NEXT, 'weapnext', '', True); + g_Console_BindKey(VK_PREV, 'weapprev', '', True); g_Console_BindKey(VK_0, 'weapon 1'); g_Console_BindKey(VK_1, 'weapon 2'); g_Console_BindKey(VK_2, 'weapon 3'); @@ -2077,9 +2189,17 @@ end; procedure g_Console_WriteConfig (filename: String); var f: TextFile; i, j: Integer; - procedure WriteFlag(name: string; flag: LongWord); + procedure WriteFlag(name: string; flag: TGameOption); begin - WriteLn(f, name, IfThen(LongBool(gsGameFlags and flag), 1, 0)); + WriteLn(f, name, Ord(flag in gsGameFlags)); + end; + + function FormatTeam(team: Byte): string; + begin + if team = TEAM_BLUE then + result := 'blue' + else + result := 'red'; end; begin @@ -2120,24 +2240,38 @@ begin WriteLn(f, 'g_max_shells ', g_Shells_GetMax()); WriteLn(f, 'g_max_gibs ', g_Gibs_GetMax()); WriteLn(f, 'g_max_corpses ', g_Corpses_GetMax()); + WriteLn(f, 'g_force_model ', g_Force_Model_Get()); + WriteLn(f, 'g_force_model_name ', g_Forced_Model_GetName()); WriteLn(f, 'sv_intertime ', gDefInterTime); // gameplay settings WriteLn(f, 'g_gamemode ', gsGameMode); - WriteLn(f, 'g_scorelimit ', gsGoalLimit); + WriteLn(f, 'g_scorelimit ', gsScoreLimit); 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 ', gsPowerupRespawnTime); + WriteLn(f, 'g_powerup_time_random ', gsPowerupRespawnRandom); WriteLn(f, 'g_spawn_invul ', gsSpawnInvul); WriteLn(f, 'g_warmup_time ', gsWarmupTime); - WriteFlag('g_friendlyfire ', GAME_OPTION_TEAMDAMAGE); - WriteFlag('g_allow_exit ', GAME_OPTION_ALLOWEXIT); - WriteFlag('g_allow_monsters ', GAME_OPTION_MONSTERS); - WriteFlag('g_dm_keys ', GAME_OPTION_DMKEYS); - WriteFlag('g_weaponstay ', GAME_OPTION_WEAPONSTAY); - WriteFlag('g_bot_vsmonsters ', GAME_OPTION_BOTVSMONSTER); - WriteFlag('g_bot_vsplayers ', GAME_OPTION_BOTVSPLAYER); + WriteFlag('g_friendlyfire ', TGameOption.TEAM_DAMAGE); + WriteFlag('g_friendly_hit_trace ', TGameOption.TEAM_HIT_TRACE); + WriteFlag('g_friendly_hit_projectile ', TGameOption.TEAM_HIT_PROJECTILE); + WriteFlag('g_powerup_randomize_respawn ', TGameOption.POWERUP_RANDOM); + WriteFlag('g_items_all_respawn_random ', TGameOption.ITEM_ALL_RANDOM); + WriteFlag('g_items_help_respawn_random ', TGameOption.ITEM_LIFE_RANDOM); + WriteFlag('g_items_ammo_respawn_random ', TGameOption.ITEM_AMMO_RANDOM); + WriteFlag('g_items_weapon_respawn_random ', TGameOption.ITEM_WEAPON_RANDOM); + WriteFlag('g_allow_exit ', TGameOption.ALLOW_EXIT); + WriteFlag('g_allow_monsters ', TGameOption.MONSTERS); + WriteFlag('g_allow_dropflag ', TGameOption.ALLOW_DROP_FLAG); + WriteFlag('g_throw_flag ', TGameOption.THROW_FLAG); + WriteFlag('g_dm_keys ', TGameOption.DM_KEYS); + WriteFlag('g_weaponstay ', TGameOption.WEAPONS_STAY); + WriteFlag('g_bot_vsmonsters ', TGameOption.BOTS_VS_MONSTERS); + WriteFlag('g_bot_vsplayers ', TGameOption.BOTS_VS_PLAYERS); // players with gPlayer1Settings do @@ -2145,12 +2279,42 @@ begin WriteLn(f, 'p1_name ', QuoteStr(Name)); WriteLn(f, 'p1_color ', Color.R, ' ', Color.G, ' ', Color.B); WriteLn(f, 'p1_model ', QuoteStr(Model)); + WriteLn(f, 'p1_team ', FormatTeam(Team)); + WriteLn(f, 'p1_autoswitch ', WeaponSwitch); + WriteLn(f, 'p1_switch_empty ', SwitchToEmpty); + WriteLn(f, 'p1_priority_ironfist ', Max(0, WeaponPreferences[WEAPON_IRONFIST])); + WriteLn(f, 'p1_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW])); + WriteLn(f, 'p1_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL])); + WriteLn(f, 'p1_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1])); + WriteLn(f, 'p1_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN2])); + WriteLn(f, 'p1_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN])); + WriteLn(f, 'p1_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER])); + WriteLn(f, 'p1_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA])); + WriteLn(f, 'p1_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG])); + WriteLn(f, 'p1_priority_superchaingun ', Max(0, WeaponPreferences[WEAPON_SUPERCHAINGUN])); + WriteLn(f, 'p1_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER])); + WriteLn(f, 'p1_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1])); end; with gPlayer2Settings do begin WriteLn(f, 'p2_name ', QuoteStr(Name)); WriteLn(f, 'p2_color ', Color.R, ' ', Color.G, ' ', Color.B); WriteLn(f, 'p2_model ', QuoteStr(Model)); + WriteLn(f, 'p2_team ', FormatTeam(Team)); + WriteLn(f, 'p2_autoswitch ', WeaponSwitch); + WriteLn(f, 'p2_switch_empty ', SwitchToEmpty); + WriteLn(f, 'p2_priority_ironfist ', Max(0, WeaponPreferences[WEAPON_IRONFIST])); + WriteLn(f, 'p2_priority_saw ', Max(0, WeaponPreferences[WEAPON_SAW])); + WriteLn(f, 'p2_priority_pistol ', Max(0, WeaponPreferences[WEAPON_PISTOL])); + WriteLn(f, 'p2_priority_shotgun1 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN1])); + WriteLn(f, 'p2_priority_shotgun2 ', Max(0, WeaponPreferences[WEAPON_SHOTGUN2])); + WriteLn(f, 'p2_priority_chaingun ', Max(0, WeaponPreferences[WEAPON_CHAINGUN])); + WriteLn(f, 'p2_priority_rocketlauncher ', Max(0, WeaponPreferences[WEAPON_ROCKETLAUNCHER])); + WriteLn(f, 'p2_priority_plasma ', Max(0, WeaponPreferences[WEAPON_PLASMA])); + WriteLn(f, 'p2_priority_bfg ', Max(0, WeaponPreferences[WEAPON_BFG])); + WriteLn(f, 'p2_priority_superchaingun ', Max(0, WeaponPreferences[WEAPON_SUPERCHAINGUN])); + WriteLn(f, 'p2_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER])); + WriteLn(f, 'p2_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1])); end; // all cvars @@ -2211,6 +2375,7 @@ begin 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; @@ -2220,6 +2385,11 @@ begin {$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], '', '') @@ -2227,4 +2397,11 @@ end; initialization Init + +{$IFDEF HEADLESS} +finalization + DoneKeyboard; + conbufStdOutRawMode := false; +{$ENDIF} + end.