X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fgame%2Fg_console.pas;h=53e8656b6ca39ccc2d027731b5e1e037a01afe6b;hb=984fd4c82ef8de657b5c2855f276c19bc19e2c15;hp=12849af9cb8a94047db132e97234246af1b6500b;hpb=546a929a401a64c32fda3380c3fe71306fd54eb1;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index 12849af..53e8656 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -74,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 - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ @@ -91,7 +95,7 @@ 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; const autoexecScript = 'autoexec.cfg'; @@ -1032,11 +1036,43 @@ begin 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_fist', PlayerSettingsCVars); + AddCommand('p2_skip_fist', PlayerSettingsCVars); + AddCommand('p1_priority_kastet', PlayerSettingsCVars); + AddCommand('p2_priority_kastet', 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_super', PlayerSettingsCVars); + AddCommand('p2_priority_super', 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); @@ -1050,6 +1086,7 @@ begin 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); @@ -1075,6 +1112,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); @@ -1116,10 +1155,12 @@ begin 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); @@ -1904,10 +1945,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; @@ -2010,7 +2054,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'); @@ -2144,11 +2188,13 @@ 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); @@ -2174,6 +2220,21 @@ begin 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_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET])); + 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_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET])); + 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 @@ -2181,6 +2242,20 @@ begin 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_kastet ', Max(0, WeaponPreferences[WEAPON_KASTET])); + 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_SHOTGUN1])); + 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_super ', Max(0, WeaponPreferences[WEAPON_SUPERPULEMET])); + WriteLn(f, 'p2_priority_flamethrower ', Max(0, WeaponPreferences[WEAPON_FLAMETHROWER])); + WriteLn(f, 'p2_priority_berserk ', Max(0, WeaponPreferences[WP_LAST+1])); end; // all cvars