X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fgame%2Fg_console.pas;h=d07bf3b4636efd661ddc6ec1768e0f0d1a683679;hb=6b8ffe735038ca0a7704e7fad15868ef32a07925;hp=fc78ef05502bd56ac0e99bd60fe7ffde303befc0;hpb=dfd3e97bffa213f5b21206b8a292b80180bab948;p=d2df-sdl.git diff --git a/src/game/g_console.pas b/src/game/g_console.pas index fc78ef0..d07bf3b 100644 --- a/src/game/g_console.pas +++ b/src/game/g_console.pas @@ -1,3 +1,4 @@ +{$MODE DELPHI} unit g_console; interface @@ -27,8 +28,8 @@ implementation uses g_textures, g_main, e_graphics, e_input, g_game, - SysUtils, g_basic, g_options, WADEDITOR, Math, - g_menu, g_language, g_net, g_netmsg; + SysUtils, g_basic, g_options, wadreader, Math, + g_menu, g_language, g_net, g_netmsg, e_log, conbuf; type TCmdProc = procedure (P: SArray); @@ -59,13 +60,13 @@ var Cons_Shown: Boolean; // Ðèñîâàòü ëè êîíñîëü? Line: String; CPos: Word; - ConsoleHistory: SArray; + //ConsoleHistory: SArray; CommandHistory: SArray; Whitelist: SArray; Commands: Array of TCommand; Aliases: Array of TAlias; CmdIndex: Word; - Offset: Word; + conSkipLines: Integer = 0; MsgArray: Array [0..4] of record Msg: String; Time: Word; @@ -113,7 +114,9 @@ begin if Cmd = 'clear' then begin - ConsoleHistory := nil; + //ConsoleHistory := nil; + cbufClear(); + conSkipLines := 0; for a := 0 to High(MsgArray) do with MsgArray[a] do @@ -166,6 +169,7 @@ begin if Cmd = 'dump' then begin + (* if ConsoleHistory <> nil then begin if Length(P) > 1 then @@ -190,6 +194,7 @@ begin g_Console_Add(Format(_lc[I_CONSOLE_DUMPED], [s])); {$I+} end; + *) end; if Cmd = 'exec' then @@ -442,6 +447,18 @@ begin AddCommand('clientlist', GameCommands); AddCommand('event', GameCommands); + AddCommand('god', GameCheats); + AddCommand('notarget', GameCheats); + AddCommand('give', GameCheats); // "exit" too ;-) + AddCommand('open', GameCheats); + AddCommand('fly', GameCheats); + AddCommand('noclip', GameCheats); + AddCommand('speedy', GameCheats); + AddCommand('jumpy', GameCheats); + AddCommand('noreload', GameCheats); + AddCommand('aimline', GameCheats); + AddCommand('automap', GameCheats); + WhitelistCommand('say'); WhitelistCommand('tell'); WhitelistCommand('overtime'); @@ -525,11 +542,67 @@ begin end; end; + +procedure drawConsoleText (); +var + CWidth, CHeight: Byte; + ty: Integer; + sp, ep: LongWord; + skip: Integer; + + procedure putLine (sp, ep: LongWord); + var + p: LongWord; + wdt, cw: Integer; + begin + p := sp; + wdt := 0; + while p <> ep do + begin + cw := e_TextureFontCharWidth(cbufAt(p), gStdFont); + if wdt+cw > gScreenWidth-8 then break; + //e_TextureFontPrintChar(X, Y: Integer; Ch: Char; FontID: DWORD; Shadow: Boolean = False); + Inc(wdt, cw); + cbufNext(p); + end; + if p <> ep then putLine(p, ep); // do rest of the line first + // now print our part + if skip = 0 then + begin + ep := p; + p := sp; + wdt := 2; + while p <> ep do + begin + cw := e_TextureFontCharWidth(cbufAt(p), gStdFont); + e_TextureFontPrintCharEx(wdt, ty, cbufAt(p), gStdFont); + Inc(wdt, cw); + cbufNext(p); + end; + Dec(ty, CHeight); + end + else + begin + Dec(skip); + end; + end; + +begin + e_TextureFontGetSize(gStdFont, CWidth, CHeight); + ty := (gScreenHeight div 2)-4-2*CHeight-Abs(Cons_Y); + skip := conSkipLines; + cbufLastLine(sp, ep); + repeat + putLine(sp, ep); + if ty+CHeight <= 0 then break; + until not cbufLineUp(sp, ep); +end; + procedure g_Console_Draw(); var CWidth, CHeight: Byte; mfW, mfH: Word; - a, b, c, d: Integer; + a, b: Integer; begin e_TextureFontGetSize(gStdFont, CWidth, CHeight); @@ -572,6 +645,8 @@ begin e_DrawSize(ID, 0, Cons_Y, Alpha, False, False, gScreenWidth, gScreenHeight div 2); e_TextureFontPrint(0, Cons_Y+(gScreenHeight div 2)-CHeight-4, '> '+Line, gStdFont); + drawConsoleText(); + (* if ConsoleHistory <> nil then begin b := 0; @@ -590,6 +665,7 @@ begin c := c + 1; end; end; + *) e_TextureFontPrint((CPos+1)*CWidth, Cons_Y+(gScreenHeight div 2)-21, '_', gStdFont); end; @@ -666,13 +742,13 @@ begin IK_DELETE: if (Length(Line) > 0) and (CPos <= Length(Line)) then Delete(Line, CPos, 1); - IK_LEFT: + IK_LEFT, IK_KPLEFT: if CPos > 1 then CPos := CPos - 1; - IK_RIGHT: + IK_RIGHT, IK_KPRIGHT: if CPos <= Length(Line) then CPos := CPos + 1; - IK_RETURN: + IK_RETURN, IK_KPRETURN: begin if Cons_Shown then g_Console_Process(Line) @@ -708,7 +784,7 @@ begin IK_TAB: if not gChatShow then Complete(); - IK_DOWN: + IK_DOWN, IK_KPDOWN: if not gChatShow then if (CommandHistory <> nil) and (CmdIndex < Length(CommandHistory)) then @@ -718,7 +794,7 @@ begin Line := CommandHistory[CmdIndex]; CPos := Length(Line) + 1; end; - IK_UP: + IK_UP, IK_KPUP: if not gChatShow then if (CommandHistory <> nil) and (CmdIndex <= Length(CommandHistory)) then @@ -728,15 +804,13 @@ begin Line := CommandHistory[CmdIndex]; Cpos := Length(Line) + 1; end; - IK_PAGEUP: // PgUp - if not gChatShow then - IncMax(OffSet, Length(ConsoleHistory)-1); - IK_PAGEDN: // PgDown - if not gChatShow then - DecMin(OffSet, 0); - IK_HOME: + IK_PAGEUP, IK_KPPAGEUP: // PgUp + if not gChatShow then Inc(conSkipLines); + IK_PAGEDN, IK_KPPAGEDN: // PgDown + if not gChatShow and (conSkipLines > 0) then Dec(conSkipLines); + IK_HOME, IK_KPHOME: CPos := 1; - IK_END: + IK_END, IK_KPEND: CPos := Length(Line) + 1; end; end; @@ -785,19 +859,25 @@ begin end; procedure g_Console_Add(L: String; Show: Boolean = False); -var - a: Integer; +{var + a: Integer;} begin // Âûâîä ñòðîê ñ ïåðåíîñàìè ïî î÷åðåäè + { while Pos(#10, L) > 0 do begin g_Console_Add(Copy(L, 1, Pos(#10, L) - 1), Show); Delete(L, 1, Pos(#10, L)); end; + } - SetLength(ConsoleHistory, Length(ConsoleHistory)+1); - ConsoleHistory[High(ConsoleHistory)] := L; + //SetLength(ConsoleHistory, Length(ConsoleHistory)+1); + //ConsoleHistory[High(ConsoleHistory)] := L; + cbufPut(L); + if (length(L) = 0) or ((L[length(L)] <> #10) and (L[length(L)] <> #13)) then cbufPut(#10); + + (* Show := Show and gAllowConsoleMessages; if Show and gShowMessages then @@ -820,12 +900,18 @@ begin Time := MsgTime; end; end; + +{$IFDEF HEADLESS} + e_WriteLog('CON: ' + L, MSG_NOTIFY); +{$ENDIF} + *) end; procedure g_Console_Clear(); begin - ConsoleHistory := nil; - Offset := 0; + //ConsoleHistory := nil; + cbufClear(); + conSkipLines := 0; end; procedure AddToHistory(L: String); @@ -875,6 +961,17 @@ begin if Trim(L) = '' then Exit; + conSkipLines := 0; // "unscroll" + + if L = 'goobers' then + begin + Line := ''; + CPos := 1; + gCheats := true; + g_Console_Add('Your memory serves you well.'); + exit; + end; + if not Quiet then begin g_Console_Add('> '+L);