X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=a6fa9c42e78673a7434f7cf500d22a601a5a5ee0;hb=886be406b752b92fc9ba2064a5cb5d1bcd981d61;hp=3f285b4badce5fe4d574e455d8715f9333e35ec0;hpb=c8d7811d45c2d34a7e297613e50570f253a0d8e9;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index 3f285b4..a6fa9c4 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -56,6 +56,7 @@ function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer; procedure g_Console_BindKey (key: Integer; down: AnsiString; up: AnsiString = ''); procedure g_Console_ProcessBind (key: Integer; down: Boolean); +procedure g_Console_ProcessBindRepeat (key: Integer); procedure g_Console_ResetBinds; procedure conwriteln (const s: AnsiString; show: Boolean=false); @@ -64,6 +65,8 @@ procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean= procedure conRegVar (const conname: AnsiString; pvar: PBoolean; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; procedure conRegVar (const conname: AnsiString; pvar: PSingle; amin, amax: Single; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; procedure conRegVar (const conname: AnsiString; pvar: PInteger; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; +procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; +procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; // <0: no arg; 0/1: true/false @@ -72,6 +75,8 @@ function conGetBoolArg (p: SSArray; idx: Integer): Integer; // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks function conParseFloat (var res: Single; const s: AnsiString): Boolean; +const + defaultConfigScript = 'dfconfig.cfg'; var gConsoleShow: Boolean = false; // True - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ @@ -81,6 +86,7 @@ var gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action] + gConfigScript: string = defaultConfigScript; implementation @@ -90,7 +96,6 @@ uses g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf; const - configScript = 'dfconfig.cfg'; autoexecScript = 'autoexec.cfg'; configComment = 'generated by doom2d, do not modify'; @@ -148,6 +153,7 @@ var end; gInputBinds: Array [0..e_MaxInputKeys - 1] of record + rep: Boolean; down, up: SSArray; end; menu_toggled: BOOLEAN; (* hack for menu controls *) @@ -287,6 +293,50 @@ begin end; +procedure wordVarHandler (me: PCommand; p: SSArray); +var + old: Integer; +begin + if (Length(p) <> 2) then + begin + conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]); + end + else + begin + try + old := PWord(me.ptr)^; + PWord(me.ptr)^ := min($FFFF, StrToDWord(p[1])); + if PWord(me.ptr)^ <> old then + g_Console_WriteGameConfig(); + except + conwritefln('invalid word value: "%s"', [p[1]]); + end; + end; +end; + + +procedure dwordVarHandler (me: PCommand; p: SSArray); +var + old: Integer; +begin + if (Length(p) <> 2) then + begin + conwritefln('%s %d', [me.cmd, PInteger(me.ptr)^]); + end + else + begin + try + old := PCardinal(me.ptr)^; + PCardinal(me.ptr)^ := StrToDWord(p[1]); + if PCardinal(me.ptr)^ <> old then + g_Console_WriteGameConfig(); + except + conwritefln('invalid dword value: "%s"', [p[1]]); + end; + end; +end; + + procedure strVarHandler (me: PCommand; p: SSArray); var old: AnsiString; @@ -347,6 +397,48 @@ begin end; +procedure conRegVar (const conname: AnsiString; pvar: PWord; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; +var + f: Integer; + cp: PCommand; +begin + f := Length(commands); + SetLength(commands, f+1); + cp := @commands[f]; + cp.cmd := LowerCase(conname); + cp.proc := nil; + cp.procEx := wordVarHandler; + cp.help := ahelp; + cp.hidden := ahidden; + cp.ptr := pvar; + cp.msg := amsg; + cp.cheat := acheat; + cp.action := -1; + cp.player := -1; +end; + + +procedure conRegVar (const conname: AnsiString; pvar: PCardinal; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; +var + f: Integer; + cp: PCommand; +begin + f := Length(commands); + SetLength(commands, f+1); + cp := @commands[f]; + cp.cmd := LowerCase(conname); + cp.proc := nil; + cp.procEx := dwordVarHandler; + cp.help := ahelp; + cp.hidden := ahidden; + cp.ptr := pvar; + cp.msg := amsg; + cp.cheat := acheat; + cp.action := -1; + cp.player := -1; +end; + + procedure conRegVar (const conname: AnsiString; pvar: PAnsiString; const ahelp: AnsiString; const amsg: AnsiString; acheat: Boolean=false; ahidden: Boolean=false); overload; var f: Integer; @@ -740,6 +832,34 @@ begin begin g_Console_Add('bind [up action]') end; + 'bindrep': + // bindrep + if Length(p) = 2 then + begin + key := LowerCase(p[1]); + i := 0; + while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i); + if i < e_MaxInputKeys then + gInputBinds[i].rep := True + else + g_Console_Add('bindrep: "' + p[1] + '" is not a key') + end + else + g_Console_Add('bindrep '); + 'bindunrep': + // bindunrep + if Length(p) = 2 then + begin + key := LowerCase(p[1]); + i := 0; + while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i); + if i < e_MaxInputKeys then + gInputBinds[i].rep := False + else + g_Console_Add('bindunrep: "' + p[1] + '" is not a key') + end + else + g_Console_Add('bindunrep '); 'bindlist': for i := 0 to e_MaxInputKeys - 1 do if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then @@ -860,15 +980,15 @@ begin AddCommand('segfault', segfault, 'make segfault'); - AddCommand('r_reset', g_Options_Commands); - AddCommand('g_language', g_Options_Commands); - AddCommand('g_max_particles', g_Options_Commands); - AddCommand('g_max_shells', g_Options_Commands); - AddCommand('g_max_gibs', g_Options_Commands); - AddCommand('g_max_corpses', g_Options_Commands); - AddCommand('g_item_respawn_time', g_Options_Commands); + AddCommand('quit', SystemCommands); + AddCommand('exit', SystemCommands); + AddCommand('r_reset', SystemCommands); + AddCommand('r_maxfps', SystemCommands); + AddCommand('g_language', SystemCommands); AddCommand('bind', BindCommands); + AddCommand('bindrep', BindCommands); + AddCommand('bindunrep', BindCommands); AddCommand('bindlist', BindCommands); AddCommand('unbind', BindCommands); AddCommand('unbindall', BindCommands); @@ -906,18 +1026,23 @@ begin AddCommand('d_joy', DebugCommands); AddCommand('d_mem', DebugCommands); - AddCommand('p1_name', GameCVars); - AddCommand('p2_name', GameCVars); - AddCommand('p1_color', GameCVars); - AddCommand('p2_color', GameCVars); - AddCommand('r_showscore', GameCVars); - AddCommand('r_showlives', GameCVars); - AddCommand('r_showstat', GameCVars); - AddCommand('r_showkillmsg', GameCVars); - AddCommand('r_showspect', GameCVars); - AddCommand('r_showping', GameCVars); + AddCommand('p1_name', PlayerSettingsCVars); + AddCommand('p2_name', PlayerSettingsCVars); + AddCommand('p1_color', PlayerSettingsCVars); + AddCommand('p2_color', PlayerSettingsCVars); + AddCommand('p1_model', PlayerSettingsCVars); + AddCommand('p2_model', PlayerSettingsCVars); + AddCommand('p1_team', PlayerSettingsCVars); + AddCommand('p2_team', PlayerSettingsCVars); + + AddCommand('g_max_particles', GameCVars); + AddCommand('g_max_shells', GameCVars); + AddCommand('g_max_gibs', GameCVars); + AddCommand('g_max_corpses', GameCVars); AddCommand('g_gamemode', GameCVars); AddCommand('g_friendlyfire', GameCVars); + AddCommand('g_friendly_hit_trace', GameCVars); + AddCommand('g_friendly_hit_projectile', GameCVars); AddCommand('g_weaponstay', GameCVars); AddCommand('g_allow_exit', GameCVars); AddCommand('g_dm_keys', GameCVars); @@ -927,19 +1052,17 @@ begin AddCommand('g_scorelimit', GameCVars); AddCommand('g_timelimit', GameCVars); AddCommand('g_maxlives', GameCVars); - AddCommand('g_warmuptime', GameCVars); + AddCommand('g_warmup_time', GameCVars); AddCommand('g_spawn_invul', GameCVars); - AddCommand('net_interp', GameCVars); - AddCommand('net_forceplayerupdate', GameCVars); - AddCommand('net_predictself', GameCVars); - AddCommand('sv_name', GameCVars); - AddCommand('sv_passwd', GameCVars); - AddCommand('sv_maxplrs', GameCVars); - AddCommand('sv_public', GameCVars); + AddCommand('g_item_respawn_time', GameCVars); AddCommand('sv_intertime', GameCVars); - AddCommand('quit', GameCommands); - AddCommand('exit', GameCommands); + AddCommand('sv_name', NetServerCVars); + AddCommand('sv_passwd', NetServerCVars); + AddCommand('sv_maxplrs', NetServerCVars); + AddCommand('sv_public', NetServerCVars); + AddCommand('sv_port', NetServerCVars); + AddCommand('pause', GameCommands); AddCommand('endgame', GameCommands); AddCommand('restart', GameCommands); @@ -962,16 +1085,21 @@ begin AddCommand('ready', GameCommands); AddCommand('kick', GameCommands); AddCommand('kick_id', GameCommands); + AddCommand('kick_pid', GameCommands); AddCommand('ban', GameCommands); - AddCommand('permban', GameCommands); AddCommand('ban_id', GameCommands); + AddCommand('ban_pid', GameCommands); + AddCommand('permban', GameCommands); AddCommand('permban_id', GameCommands); + AddCommand('permban_pid', GameCommands); + AddCommand('permban_ip', GameCommands); AddCommand('unban', GameCommands); AddCommand('connect', GameCommands); AddCommand('disconnect', GameCommands); AddCommand('reconnect', GameCommands); AddCommand('say', GameCommands); AddCommand('tell', GameCommands); + AddCommand('centerprint', GameCommands); AddCommand('overtime', GameCommands); AddCommand('rcon_password', GameCommands); AddCommand('rcon', GameCommands); @@ -1017,7 +1145,10 @@ begin WhitelistCommand('endmap'); WhitelistCommand('restart'); WhitelistCommand('kick'); + WhitelistCommand('kick_pid'); WhitelistCommand('ban'); + WhitelistCommand('ban_pid'); + WhitelistCommand('centerprint'); WhitelistCommand('addbot'); WhitelistCommand('bot_add'); @@ -1027,14 +1158,23 @@ begin WhitelistCommand('g_gamemode'); WhitelistCommand('g_friendlyfire'); + WhitelistCommand('g_friendly_hit_trace'); + WhitelistCommand('g_friendly_hit_projectile'); WhitelistCommand('g_weaponstay'); WhitelistCommand('g_allow_exit'); + WhitelistCommand('g_dm_keys'); WhitelistCommand('g_allow_monsters'); + WhitelistCommand('g_bot_vsmonsters'); + WhitelistCommand('g_bot_vsplayers'); WhitelistCommand('g_scorelimit'); WhitelistCommand('g_timelimit'); + WhitelistCommand('g_maxlives'); + WhitelistCommand('g_warmup_time'); + WhitelistCommand('g_spawn_invul'); + WhitelistCommand('g_item_respawn_time'); g_Console_ResetBinds; - g_Console_ReadConfig(configScript); + g_Console_ReadConfig(gConfigScript); g_Console_ReadConfig(autoexecScript); gParsingBinds := False; end; @@ -1717,6 +1857,7 @@ begin ASSERT(key < e_MaxInputKeys); if key > 0 then begin + gInputBinds[key].rep := False; gInputBinds[key].down := ParseAlias(down); gInputBinds[key].up := ParseAlias(up); end; @@ -1812,6 +1953,21 @@ begin menu_toggled := False end; +procedure g_Console_ProcessBindRepeat (key: Integer); + var i: Integer; +begin + if gConsoleShow or gChatShow or (g_ActiveWindow <> nil) then + begin + KeyPress(key); // key repeat in menus and shit + Exit; + end; + if BindsAllowed(key) and gInputBinds[key].rep then + begin + for i := 0 to High(gInputBinds[key].down) do + g_Console_Process(gInputBinds[key].down[i], True); + end; +end; + procedure g_Console_ResetBinds; var i: Integer; begin @@ -1926,10 +2082,26 @@ end; procedure g_Console_WriteConfig (filename: String); var f: TextFile; i, j: Integer; + + procedure WriteFlag(name: string; flag: LongWord); + begin + WriteLn(f, name, IfThen(LongBool(gsGameFlags and flag), 1, 0)); + end; + + function FormatTeam(team: Byte): string; + begin + if team = TEAM_BLUE then + result := 'blue' + else + result := 'red'; + end; + begin AssignFile(f, filename); Rewrite(f); WriteLn(f, '// ' + configComment); + + // binds WriteLn(f, 'unbindall'); for i := 0 to e_MaxInputKeys - 1 do if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then @@ -1940,26 +2112,66 @@ begin if Length(gInputBinds[i].up) > 0 then Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up))); WriteLn(f, ''); + if gInputBinds[i].rep then + WriteLn(f, 'bindrep ', e_KeyNames[i]); end; + + // lang if gAskLanguage then WriteLn(f, 'g_language ask') else WriteLn(f, 'g_language ', gLanguage); + + // net server + WriteLn(f, 'sv_name ', QuoteStr(NetServerName)); + WriteLn(f, 'sv_passwd ', QuoteStr(NetPassword)); + WriteLn(f, 'sv_maxplrs ', NetMaxClients); + WriteLn(f, 'sv_port ', NetPort); + WriteLn(f, 'sv_public ', IfThen(NetUseMaster, 1, 0)); + + // game settings WriteLn(f, 'g_max_particles ', g_GFX_GetMax()); 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_item_respawn_time ', ITEM_RESPAWNTIME div 36); + WriteLn(f, 'sv_intertime ', gDefInterTime); + + // gameplay settings + WriteLn(f, 'g_gamemode ', gsGameMode); + WriteLn(f, 'g_scorelimit ', gsGoalLimit); + WriteLn(f, 'g_timelimit ', gsTimeLimit); + WriteLn(f, 'g_maxlives ', gsMaxLives); + WriteLn(f, 'g_item_respawn_time ', gsItemRespawnTime); + 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_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); + + // players with gPlayer1Settings do 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)); 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)); end; + + // all cvars for i := 0 to High(commands) do begin if not commands[i].cheat then @@ -1973,6 +2185,14 @@ begin begin WriteLn(f, commands[i].cmd, ' ', PInteger(commands[i].ptr)^) end + else if @commands[i].procEx = @wordVarHandler then + begin + WriteLn(f, commands[i].cmd, ' ', PWord(commands[i].ptr)^) + end + else if @commands[i].procEx = @dwordVarHandler then + begin + WriteLn(f, commands[i].cmd, ' ', PCardinal(commands[i].ptr)^) + end else if @commands[i].procEx = @singleVarHandler then begin WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6) @@ -1986,6 +2206,8 @@ begin end end end; + + WriteLn(f, 'r_maxfps ', gMaxFPS); WriteLn(f, 'r_reset'); CloseFile(f) end; @@ -1996,7 +2218,7 @@ begin if gParsingBinds = false then begin s := e_GetWriteableDir(ConfigDirs); - g_Console_WriteConfig(e_CatPath(s, configScript)) + g_Console_WriteConfig(e_CatPath(s, gConfigScript)) end end;