# HG changeset patch # User sheepluva # Date 1461949312 -7200 # Node ID f2031643fe9843d29d9424731365cf86ffb5ee24 # Parent ee85798d697466c78750edc16404471acac2372c show credits only briefly diff -r ee85798d6974 -r f2031643fe98 hedgewars/hwengine.pas --- a/hedgewars/hwengine.pas Fri Apr 29 18:18:32 2016 +0200 +++ b/hedgewars/hwengine.pas Fri Apr 29 19:01:52 2016 +0200 @@ -60,12 +60,12 @@ begin mapCredits:= read1stLn(cPathz[ptMapCurrent] + '/credits.txt'); if Length(mapCredits) > 0 then - AddChatString(char(6) + '© Map: ' + mapCredits); + AddChatString(char(#11) + '© Map: ' + mapCredits); end; themeCredits:= read1stLn(cPathz[ptCurrTheme] + '/credits.txt'); if Length(themeCredits) > 0 then - AddChatString(char(8) + '© Theme: ' + themeCredits); + AddChatString(char(#12) + '© Theme: ' + themeCredits); end; /////////////////////////////////////////////////////////////////////////////// diff -r ee85798d6974 -r f2031643fe98 hedgewars/uChat.pas --- a/hedgewars/uChat.pas Fri Apr 29 18:18:32 2016 +0200 +++ b/hedgewars/uChat.pas Fri Apr 29 19:01:52 2016 +0200 @@ -70,7 +70,7 @@ const - colors: array[#0..#9] of TSDL_Color = ( + colors: array[#0..#12] of TSDL_Color = ( (r:$FF; g:$FF; b:$FF; a:$FF), // #0 unused, feel free to take it for anything (r:$FF; g:$FF; b:$FF; a:$FF), // #1 chat message [White] (r:$FF; g:$00; b:$FF; a:$FF), // #2 action message [Purple] @@ -80,7 +80,10 @@ (r:$00; g:$FF; b:$FF; a:$FF), // #6 input line [Light Blue] (r:$FF; g:$80; b:$80; a:$FF), // #7 team gone [Light Red] (r:$FF; g:$D0; b:$80; a:$FF), // #8 team back [Light Orange] - (r:$DF; g:$DF; b:$DF; a:$FF) // #9 hog speech [Light Gray] + (r:$DF; g:$DF; b:$DF; a:$FF), // #9 hog speech [Light Gray] + (r:$FF; g:$00; b:$FF; a:$AF), // #10 music credits [Purple] + (r:$00; g:$FF; b:$FF; a:$AF), // #11 map credits [Light Blue] + (r:$FF; g:$D0; b:$80; a:$AF) // #12 theme credits [Light Orange] ); ChatCommandz: array [TChatCmd] of record ChatCmd: string[31]; @@ -205,10 +208,13 @@ end; const ClDisplayDuration = 12500; + CreditsDisplayDur = 2500; procedure SetLine(var cl: TChatLine; str: shortstring; isInput: boolean); var color : TSDL_Color; + credits: boolean; begin +credits:= false; if isInput then begin cl.s:= str; @@ -220,6 +226,7 @@ if str[1] <= High(colors) then begin color:= colors[str[1]]; + credits:= (str[1] >= #10) and (str[1] <= #12); delete(str, 1, 1); end // fallback if invalid color @@ -234,7 +241,10 @@ // set texture, note: variables cl.s and str will be different here if isInput RenderChatLineTex(cl, str); -cl.Time:= RealTicks + ClDisplayDuration; +if credits then + cl.Time:= RealTicks + CreditsDisplayDur +else + cl.Time:= RealTicks + ClDisplayDuration; end; // For uStore texture recreation diff -r ee85798d6974 -r f2031643fe98 hedgewars/uSound.pas --- a/hedgewars/uSound.pas Fri Apr 29 18:18:32 2016 +0200 +++ b/hedgewars/uSound.pas Fri Apr 29 19:01:52 2016 +0200 @@ -593,7 +593,7 @@ s:= readValueFromINI(MusicFN, '/Music/credits.txt'); if Length(s) > 0 then - AddChatString(char(2) + '© Music: ' + s); + AddChatString(char(#10) + '© Music: ' + s); SDLCheck(Mix_FadeInMusic(Mus, -1, 3000) <> -1, 'Mix_FadeInMusic', false) end;