X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=edf484f1dd8177dc59170710d0c48c6f4efeffb7;hp=fd8e24b3cf1bd05371a5d9a1c277fc4bdb194418;hb=bccf523c0320f1f8f33edb72caec0a67cfa2e422;hpb=31039aaf7e1623de1a4be292d0c77532fcfbf3e6 diff --git a/src/game/g_console.pas b/src/game/g_console.pas index fd8e24b..edf484f 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -37,21 +37,22 @@ uses FIRST_ACTION = ACTION_JUMP; LAST_ACTION = ACTION_WEAPPREV; -procedure g_Console_Init (); -procedure g_Console_Update (); -procedure g_Console_Draw (); -procedure g_Console_Switch (); +procedure g_Console_Init; +procedure g_Console_Update; +procedure g_Console_Draw; procedure g_Console_Char (C: AnsiChar); procedure g_Console_Control (K: Word); procedure g_Console_Process (L: AnsiString; quiet: Boolean=false); procedure g_Console_Add (L: AnsiString; show: Boolean=false); -procedure g_Console_Clear (); +procedure g_Console_Clear; function g_Console_CommandBlacklisted (C: AnsiString): Boolean; procedure g_Console_ReadConfig (filename: String); procedure g_Console_WriteConfig (filename: String); +procedure g_Console_WriteGameConfig; 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_ProcessBind (key: Integer; down: Boolean); @@ -60,15 +61,13 @@ procedure g_Console_ResetBinds; procedure conwriteln (const s: AnsiString; show: Boolean=false); procedure conwritefln (const s: AnsiString; args: array of const; show: Boolean=false); -// <0: no arg; 0/1: true/false -function conGetBoolArg (p: SSArray; idx: Integer): Integer; - -procedure g_Console_Chat_Switch (team: Boolean=false); - 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; +// <0: no arg; 0/1: true/false +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; @@ -79,6 +78,7 @@ var gChatTeam: Boolean = false; gAllowConsoleMessages: Boolean = true; gJustChatted: Boolean = false; // ÷òîáû àäìèí â èíòåðå ÷àòÿñü íå ïðîìàòûâàë ñòàòèñòèêó + gParsingBinds: Boolean = true; // íå ïåðåñîõðàíÿòü êîíôèã âî âðåìÿ ïàðñèíãà gPlayerAction: Array [0..1, 0..LAST_ACTION] of Boolean; // [player, action] implementation @@ -86,7 +86,7 @@ implementation uses g_textures, g_main, e_graphics, e_input, g_game, SysUtils, g_basic, g_options, Math, g_touch, - g_menu, g_language, g_net, g_netmsg, e_log, conbuf; + g_menu, g_gui, g_language, g_net, g_netmsg, e_log, conbuf; type @@ -145,8 +145,29 @@ var gInputBinds: Array [0..e_MaxInputKeys - 1] of record down, up: SSArray; end; + menu_toggled: BOOLEAN; (* hack for menu controls *) + gSkipFirstChar: Boolean; (* hack for console/chat input *) +procedure g_Console_Switch; +begin + gChatShow := False; + gConsoleShow := not gConsoleShow; + Cons_Shown := True; + g_Touch_ShowKeyboard(gConsoleShow or gChatShow); +end; + +procedure g_Console_Chat_Switch (Team: Boolean = False); +begin + if not g_Game_IsNet then Exit; + gConsoleShow := False; + gChatShow := not gChatShow; + gChatTeam := Team; + Line := ''; + CPos := 1; + g_Touch_ShowKeyboard(gConsoleShow or gChatShow); +end; + // poor man's floating literal parser; i'm sorry, but `StrToFloat()` sux cocks function conParseFloat (var res: Single; const s: AnsiString): Boolean; var @@ -201,6 +222,8 @@ end; procedure boolVarHandler (me: PCommand; p: SSArray); procedure binaryFlag (var flag: Boolean; msg: AnsiString); + var + old: Boolean; begin if (Length(p) > 2) then begin @@ -208,12 +231,15 @@ procedure boolVarHandler (me: PCommand; p: SSArray); end else begin + old := flag; case conGetBoolArg(p, 1) of -1: begin end; 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end; 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end; 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end; end; + if flag <> old then + g_Console_WriteGameConfig(); if (Length(msg) = 0) then msg := p[0] else msg += ':'; if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]); end; @@ -224,24 +250,8 @@ end; procedure intVarHandler (me: PCommand; p: SSArray); - procedure binaryFlag (var flag: Boolean; msg: AnsiString); - begin - if (Length(p) > 2) then - begin - conwritefln('too many arguments to ''%s''', [p[0]]); - end - else - begin - case conGetBoolArg(p, 1) of - -1: begin end; - 0: if not me.cheat or conIsCheatsEnabled then flag := false else begin conwriteln('not available'); exit; end; - 1: if not me.cheat or conIsCheatsEnabled then flag := true else begin conwriteln('not available'); exit; end; - 666: if not me.cheat or conIsCheatsEnabled then flag := not flag else begin conwriteln('not available'); exit; end; - end; - if (Length(msg) = 0) then msg := p[0] else msg += ':'; - if flag then conwritefln('%s tan', [msg]) else conwritefln('%s ona', [msg]); - end; - end; +var + old: Integer; begin if (Length(p) <> 2) then begin @@ -250,7 +260,10 @@ begin else begin try + old := PInteger(me.ptr)^; PInteger(me.ptr)^ := StrToInt(p[1]); + if PInteger(me.ptr)^ <> old then + g_Console_WriteGameConfig(); except conwritefln('invalid integer value: "%s"', [p[1]]); end; @@ -312,7 +325,7 @@ type procedure singleVarHandler (me: PCommand; p: SSArray); var pv: PVarSingle; - nv: Single; + nv, old: Single; msg: AnsiString; begin if (Length(p) > 2) then @@ -321,6 +334,7 @@ begin exit; end; pv := PVarSingle(me.ptr); + old := pv.val^; if (Length(p) = 2) then begin if me.cheat and (not conIsCheatsEnabled) then begin conwriteln('not available'); exit; end; @@ -342,6 +356,8 @@ begin pv.val^ := nv; end; end; + if pv.val^ <> old then + g_Console_WriteGameConfig(); msg := me.msg; if (Length(msg) = 0) then msg := me.cmd else msg += ':'; conwritefln('%s %s', [msg, pv.val^]); @@ -617,47 +633,58 @@ begin pp^ := 0; end; +function GetCommandString (p: SSArray): AnsiString; + var i: Integer; +begin + result := ''; + if Length(p) >= 1 then + begin + result := p[0]; + for i := 1 to High(p) do + result := result + '; ' + p[i] + end +end; + +function QuoteStr(str: String): String; +begin + if Pos(' ', str) > 0 then + Result := '"' + str + '"' + else + Result := str; +end; + procedure BindCommands (p: SSArray); - var cmd, key, act: AnsiString; i, j: Integer; + var cmd, key: AnsiString; i: Integer; begin cmd := LowerCase(p[0]); case cmd of 'bind': - // bind [up] - if Length(p) >= 3 then + // bind [down [up]] + if (Length(p) >= 2) and (Length(p) <= 4) then begin i := 0; key := LowerCase(p[1]); - if Length(p) = 4 then act := p[3] else act := ''; while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i); if i < e_MaxInputKeys then - g_Console_BindKey(i, p[2], act) + begin + if Length(p) = 2 then + g_Console_Add(QuoteStr(e_KeyNames[i]) + ' = ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up))) + else if Length(p) = 3 then + g_Console_BindKey(i, p[2], '') + else (* len = 4 *) + g_Console_BindKey(i, p[2], p[3]) + end + else + g_Console_Add('bind: "' + p[1] + '" is not a key') end else - g_Console_Add('bind [up action]'); + begin + g_Console_Add('bind [up action]') + end; 'bindlist': for i := 0 to e_MaxInputKeys - 1 do - begin if (gInputBinds[i].down <> nil) or (gInputBinds[i].up <> nil) then - begin - act := e_KeyNames[i] + ' "'; - if (gInputBinds[i].down <> nil) then - begin - act := act + gInputBinds[i].down[0]; - for j := 1 to High(gInputBinds[i].down) - 1 do - act := act + '; ' + gInputBinds[i].down[j]; - end; - act := act + '" "'; - if (gInputBinds[i].up <> nil) then - begin - act := act + gInputBinds[i].up[0]; - for j := 1 to High(gInputBinds[i].up) do - act := act + '; ' + gInputBinds[i].up[j]; - end; - act := act + '"'; - g_Console_Add(act) - end - end; + g_Console_Add(e_KeyNames[i] + ' ' + QuoteStr(GetCommandString(gInputBinds[i].down)) + ' ' + QuoteStr(GetCommandString(gInputBinds[i].up))); 'unbind': // unbind if Length(p) = 2 then @@ -667,6 +694,8 @@ begin while (i < e_MaxInputKeys) and (key <> LowerCase(e_KeyNames[i])) do inc(i); if i < e_MaxInputKeys then g_Console_BindKey(i, '') + else + g_Console_Add('unbind: "' + p[1] + '" is not a key') end else g_Console_Add('unbind '); @@ -674,9 +703,38 @@ begin for i := 0 to e_MaxInputKeys - 1 do g_Console_BindKey(i, ''); 'showkeyboard': - g_Touch_ShowKeyboard(True); + g_Touch_ShowKeyboard(True); 'hidekeyboard': - g_Touch_ShowKeyboard(False); + g_Touch_ShowKeyboard(False); + 'togglemenu': + if gConsoleShow then + begin + g_Console_Switch; + menu_toggled := True + end + else + begin + KeyPress(VK_ESCAPE); + menu_toggled := True + end; + 'toggleconsole': + begin + g_Console_Switch; + gSkipFirstChar := g_Console_Interactive(); + end; + 'togglechat': + begin + if not gConsoleShow and (g_ActiveWindow = nil) then + g_Console_Chat_Switch; + gSkipFirstChar := not g_Console_Interactive() + end; + 'toggleteamchat': + if gGameSettings.GameMode in [GM_TDM, GM_CTF] then + begin + if not gConsoleShow and (g_ActiveWindow = nil) then + g_Console_Chat_Switch(True); + gSkipFirstChar := not g_Console_Interactive() + end; end end; @@ -762,6 +820,10 @@ begin AddCommand('unbindall', BindCommands); AddCommand('showkeyboard', BindCommands); AddCommand('hidekeyboard', BindCommands); + AddCommand('togglemenu', BindCommands); + AddCommand('toggleconsole', BindCommands); + AddCommand('togglechat', BindCommands); + AddCommand('toggleteamchat', BindCommands); AddCommand('clear', ConsoleCommands, 'clear console'); AddCommand('clearhistory', ConsoleCommands); @@ -794,7 +856,6 @@ begin AddCommand('p2_name', GameCVars); AddCommand('p1_color', GameCVars); AddCommand('p2_color', GameCVars); - AddCommand('r_showtime', GameCVars); AddCommand('r_showscore', GameCVars); AddCommand('r_showlives', GameCVars); AddCommand('r_showstat', GameCVars); @@ -863,8 +924,6 @@ begin AddCommand('clientlist', GameCommands); AddCommand('event', GameCommands); AddCommand('screenshot', GameCommands); - AddCommand('togglechat', GameCommands); - AddCommand('toggleteamchat', GameCommands); AddCommand('weapon', GameCommands); AddCommand('p1_weapon', GameCommands); AddCommand('p2_weapon', GameCommands); @@ -921,6 +980,7 @@ begin g_Console_ResetBinds; g_Console_ReadConfig(GameDir + '/dfconfig.cfg'); g_Console_ReadConfig(GameDir + '/autoexec.cfg'); + gParsingBinds := False; g_Console_Add(Format(_lc[I_CONSOLE_WELCOME], [GAME_VERSION])); g_Console_Add(''); @@ -1108,31 +1168,14 @@ begin e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont); end; -procedure g_Console_Switch(); -begin - gChatShow := False; - gConsoleShow := not gConsoleShow; - Cons_Shown := True; - g_Touch_ShowKeyboard(gConsoleShow or gChatShow); -end; - -procedure g_Console_Chat_Switch(Team: Boolean = False); -begin - if not g_Game_IsNet then Exit; - gConsoleShow := False; - gChatShow := not gChatShow; - gChatTeam := Team; - Line := ''; - CPos := 1; - g_Touch_ShowKeyboard(gConsoleShow or gChatShow); -end; - procedure g_Console_Char(C: AnsiChar); begin -// if gChatShow then -// Exit; - Insert(C, Line, CPos); - CPos := CPos + 1; + if not gSkipFirstChar then + begin + Insert(C, Line, CPos); + CPos := CPos + 1; + end; + gSkipFirstChar := False end; @@ -1264,13 +1307,13 @@ begin IK_DELETE: if (Length(Line) > 0) and (CPos <= Length(Line)) then Delete(Line, CPos, 1); - IK_LEFT, IK_KPLEFT, VK_LEFT: + IK_LEFT, IK_KPLEFT, VK_LEFT, JOY0_LEFT, JOY1_LEFT, JOY2_LEFT, JOY3_LEFT: if CPos > 1 then CPos := CPos - 1; - IK_RIGHT, IK_KPRIGHT, VK_RIGHT: + IK_RIGHT, IK_KPRIGHT, VK_RIGHT, JOY0_RIGHT, JOY1_RIGHT, JOY2_RIGHT, JOY3_RIGHT: if CPos <= Length(Line) then CPos := CPos + 1; - IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE: + IK_RETURN, IK_KPRETURN, VK_OPEN, VK_FIRE, JOY0_ATTACK, JOY1_ATTACK, JOY2_ATTACK, JOY3_ATTACK: begin if Cons_Shown then g_Console_Process(Line) @@ -1307,7 +1350,7 @@ begin IK_TAB: if not gChatShow then Complete(); - IK_DOWN, IK_KPDOWN, VK_DOWN: + IK_DOWN, IK_KPDOWN, VK_DOWN, JOY0_DOWN, JOY1_DOWN, JOY2_DOWN, JOY3_DOWN: if not gChatShow then if (CommandHistory <> nil) and (CmdIndex < Length(CommandHistory)) then @@ -1317,7 +1360,7 @@ begin Line := CommandHistory[CmdIndex]; CPos := Length(Line) + 1; end; - IK_UP, IK_KPUP, VK_UP: + IK_UP, IK_KPUP, VK_UP, JOY0_UP, JOY1_UP, JOY2_UP, JOY3_UP: if not gChatShow then if (CommandHistory <> nil) and (CmdIndex <= Length(CommandHistory)) then @@ -1327,15 +1370,34 @@ begin Line := CommandHistory[CmdIndex]; Cpos := Length(Line) + 1; end; - IK_PAGEUP, IK_KPPAGEUP, VK_PREV: // PgUp + IK_PAGEUP, IK_KPPAGEUP, VK_PREV, JOY0_PREV, JOY1_PREV, JOY2_PREV, JOY3_PREV: // PgUp if not gChatShow then Inc(conSkipLines); - IK_PAGEDN, IK_KPPAGEDN, VK_NEXT: // PgDown + IK_PAGEDN, IK_KPPAGEDN, VK_NEXT, JOY0_NEXT, JOY1_NEXT, JOY2_NEXT, JOY3_NEXT: // PgDown if not gChatShow and (conSkipLines > 0) then Dec(conSkipLines); IK_HOME, IK_KPHOME: CPos := 1; IK_END, IK_KPEND: CPos := Length(Line) + 1; - end; + IK_A..IK_Z, IK_SPACE, IK_SHIFT, IK_RSHIFT, IK_CAPSLOCK, IK_LBRACKET, IK_RBRACKET, + IK_SEMICOLON, IK_QUOTE, IK_BACKSLASH, IK_SLASH, IK_COMMA, IK_DOT, IK_EQUALS, + IK_0, IK_1, IK_2, IK_3, IK_4, IK_5, IK_6, IK_7, IK_8, IK_9, IK_MINUS, IK_EQUALS: + (* see TEXTINPUT event *) + else + if not gSkipFirstChar then + begin + if gConsoleShow and g_Console_MatchBind(K, 'toggleconsole') then + g_Console_Switch; + + if g_Console_MatchBind(K, 'togglemenu') then + begin + menu_toggled := True; + if gChatShow then + g_Console_Chat_Switch + else if gConsoleShow then + g_Console_Switch + end + end + end end; function GetStr(var Str: AnsiString): AnsiString; @@ -1612,12 +1674,12 @@ begin if key > 0 then begin gInputBinds[key].down := ParseAlias(down); - gInputBinds[key].up := ParseAlias(up) - end + gInputBinds[key].up := ParseAlias(up); + end; + g_Console_WriteGameConfig(); end; -function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer; - var i: Integer; +function g_Console_MatchBind (key: Integer; down: AnsiString; up: AnsiString = ''): Boolean; function EqualsCommandLists (a, b: SSArray): Boolean; var i, len: Integer; @@ -1633,6 +1695,14 @@ function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): end end; +begin + ASSERT(key >= 0); + ASSERT(key < e_MaxInputKeys); + result := EqualsCommandLists(ParseAlias(down), gInputBinds[key].down) and EqualsCommandLists(ParseAlias(up), gInputBinds[key].up) +end; + +function g_Console_FindBind (n: Integer; down: AnsiString; up: AnsiString = ''): Integer; + var i: Integer; begin ASSERT(n >= 1); result := 0; @@ -1640,13 +1710,10 @@ begin i := 0; while (n >= 1) and (i < e_MaxInputKeys) do begin - if EqualsCommandLists(ParseAlias(down), gInputBinds[i].down) then + if g_Console_MatchBind(i, down, up) then begin - if EqualsCommandLists(ParseAlias(up), gInputBinds[i].up) then - begin - result := i; - dec(n) - end + result := i; + dec(n) end; inc(i) end; @@ -1668,15 +1735,21 @@ end; procedure g_Console_ProcessBind (key: Integer; down: Boolean); var i: Integer; begin - if (not gChatShow) and (not gConsoleShow) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then + if (not g_GUIGrabInput) and (key >= 0) and (key < e_MaxInputKeys) and ((gInputBinds[key].down <> nil) or (gInputBinds[key].up <> nil)) then begin if down then - for i := 0 to High(gInputBinds[key].down) do - g_Console_Process(gInputBinds[key].down[i], True) + begin + if not gChatShow then + for i := 0 to High(gInputBinds[key].down) do + g_Console_Process(gInputBinds[key].down[i], True); + end else for i := 0 to High(gInputBinds[key].up) do g_Console_Process(gInputBinds[key].up[i], True) - end + end; + if down and not menu_toggled then + KeyPress(key); + menu_toggled := False end; procedure g_Console_ResetBinds; @@ -1685,6 +1758,8 @@ begin for i := 0 to e_MaxInputKeys - 1 do g_Console_BindKey(i, '', ''); + g_Console_BindKey(IK_GRAVE, 'toggleconsole'); + g_Console_BindKey(IK_ESCAPE, 'togglemenu'); g_Console_BindKey(IK_A, '+p1_moveleft', '-p1_moveleft'); g_Console_BindKey(IK_D, '+p1_moveright', '-p1_moveright'); g_Console_BindKey(IK_W, '+p1_lookup', '-p1_lookup'); @@ -1716,18 +1791,20 @@ begin (* for i := 0 to e_MaxJoys - 1 do *) for i := 0 to 1 do begin - g_Console_BindKey(e_JoyAxisToKey(i, 0, 0), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft'); - g_Console_BindKey(e_JoyAxisToKey(i, 0, 1), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright'); - g_Console_BindKey(e_JoyAxisToKey(i, 1, 0), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup'); - g_Console_BindKey(e_JoyAxisToKey(i, 1, 1), '+p' + IntToStr(i mod 2 + 1) + '_lookdown', '-p' + IntToStr(i mod 2 + 1) + '_lookdown'); + g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_LEFT), '+p' + IntToStr(i mod 2 + 1) + '_moveleft', '-p' + IntToStr(i mod 2 + 1) + '_moveleft'); + g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_RIGHT), '+p' + IntToStr(i mod 2 + 1) + '_moveright', '-p' + IntToStr(i mod 2 + 1) + '_moveright'); + g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_UP), '+p' + IntToStr(i mod 2 + 1) + '_lookup', '-p' + IntToStr(i mod 2 + 1) + '_lookup'); + g_Console_BindKey(e_JoyHatToKey(i, 0, HAT_DOWN), '+p' + IntToStr(i mod 2 + 1) + '_lookdown', '-p' + IntToStr(i mod 2 + 1) + '_lookdown'); 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, 10), 'togglemenu'); end; + g_Console_BindKey(VK_ESCAPE, 'togglemenu'); g_Console_BindKey(VK_LSTRAFE, '+moveleft; +strafe', '-moveleft; -strafe'); g_Console_BindKey(VK_RSTRAFE, '+moveright; +strafe', '-moveright; -strafe'); g_Console_BindKey(VK_LEFT, '+moveleft', '-moveleft'); @@ -1753,13 +1830,11 @@ begin g_Console_BindKey(VK_A, 'weapon 11'); g_Console_BindKey(VK_CHAT, 'togglechat'); g_Console_BindKey(VK_TEAM, 'toggleteamchat'); + g_Console_BindKey(VK_CONSOLE, 'toggleconsole'); g_Console_BindKey(VK_PRINTSCR, 'screenshot'); g_Console_BindKey(VK_STATUS, '+scores', '-scores'); g_Console_BindKey(VK_SHOWKBD, 'showkeyboard'); g_Console_BindKey(VK_HIDEKBD, 'hidekeyboard'); - - // VK_CONSOLE - // VK_ESCAPE end; procedure g_Console_ReadConfig (filename: String); @@ -1780,10 +1855,10 @@ begin while (i <= len) and (s[i] <= ' ') do inc(i); (* skip comments *) if (i <= len) and ((s[i] <> '#') and ((i + 1 > len) or (s[i] <> '/') or (s[i + 1] <> '/'))) then - g_Console_Process(s, True) + g_Console_Process(s, True); end end; - CloseFile(f) + CloseFile(f); end end; @@ -1795,27 +1870,15 @@ begin WriteLn(f, '// generated by doom2d, do not modify'); WriteLn(f, 'unbindall'); for i := 0 to e_MaxInputKeys - 1 do - begin if (Length(gInputBinds[i].down) > 0) or (Length(gInputBinds[i].up) > 0) then begin - Write(f, 'bind ', e_KeyNames[i], ' "'); - if Length(gInputBinds[i].down) > 0 then - begin - Write(f, gInputBinds[i].down[0]); - for j := 1 to High(gInputBinds[i].down) do - Write(f, '; ', gInputBinds[i].down[j]) - end; - Write(f, '"'); + Write(f, 'bind ', e_KeyNames[i], ' ', QuoteStr(GetCommandString(gInputBinds[i].down))); + if Length(gInputBinds[i].down) = 0 then + Write(f, '""'); if Length(gInputBinds[i].up) > 0 then - begin - Write(f, ' "', gInputBinds[i].up[0]); - for j := 1 to High(gInputBinds[i].up) do - Write(f, '; ', gInputBinds[i].up[j]); - Write(f, '"') - end; - WriteLn(f) - end - end; + Write(f, ' ', QuoteStr(GetCommandString(gInputBinds[i].up))); + WriteLn(f, ''); + end; for i := 0 to High(commands) do begin if not commands[i].cheat then @@ -1823,20 +1886,26 @@ begin if @commands[i].procEx = @boolVarHandler then begin if PBoolean(commands[i].ptr)^ then j := 1 else j := 0; - WriteLn(f, commands[i].cmd, ' "', j, '"') + WriteLn(f, commands[i].cmd, ' ', j) end else if @commands[i].procEx = @intVarHandler then begin - WriteLn(f, commands[i].cmd, ' "', PInteger(commands[i].ptr)^, '"') + WriteLn(f, commands[i].cmd, ' ', PInteger(commands[i].ptr)^) end else if @commands[i].procEx = @singleVarHandler then begin - WriteLn(f, commands[i].cmd, ' "', PVarSingle(commands[i].ptr).val^:0:6, '"') + WriteLn(f, commands[i].cmd, ' ', PVarSingle(commands[i].ptr).val^:0:6) end end end; CloseFile(f) end; +procedure g_Console_WriteGameConfig; +begin + if gParsingBinds then + Exit; + g_Console_WriteConfig(GameDir + '/dfconfig.cfg'); +end; end.