diff --git a/src/game/g_console.pas b/src/game/g_console.pas
index 01cd41ab1c677fa9c45a791de02d2a7ea4d59644..c38b476408f08dc42aba24a0b6ca04e000fc4e06 100644 (file)
--- a/src/game/g_console.pas
+++ b/src/game/g_console.pas
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
// 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 - êîíñîëü îòêðûòà èëè îòêðûâàåòñÿ
gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó
gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà
gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action]
+ gConfigScript: string = defaultConfigScript;
implementation
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';
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;
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;
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('g_language', SystemCommands);
AddCommand('bind', BindCommands);
AddCommand('bindlist', BindCommands);
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('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_weaponstay', GameCVars);
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('g_respawn_items', 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);
WhitelistCommand('g_scorelimit');
WhitelistCommand('g_timelimit');
WhitelistCommand('g_dm_keys');
- WhitelistCommand('g_respawn_items');
WhitelistCommand('g_spawn_invul');
- WhitelistCommand('g_warmuptime');
+ WhitelistCommand('g_item_respawn_time');
+ WhitelistCommand('g_warmup_time');
g_Console_ResetBinds;
- g_Console_ReadConfig(configScript);
+ g_Console_ReadConfig(gConfigScript);
g_Console_ReadConfig(autoexecScript);
gParsingBinds := False;
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;
+
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
Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up)));
WriteLn(f, '');
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_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));
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));
end;
+
+ // all cvars
for i := 0 to High(commands) do
begin
if not commands[i].cheat then
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)
end
end
end;
+
WriteLn(f, 'r_reset');
CloseFile(f)
end;
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;