# HG changeset patch # User Wuzzy # Date 1531849469 -7200 # Node ID c41b16ac2e0562da749eccd3f64530515572ba00 # Parent 4f00b08d6f1e4d709bc98fb8811e906a21d2ed6b Clarify the wording of a few checkFails messages diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uAmmos.pas --- a/hedgewars/uAmmos.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uAmmos.pas Tue Jul 17 19:44:29 2018 +0200 @@ -160,7 +160,7 @@ function GetAmmoByNum(num: LongInt): PHHAmmo; begin - if checkFails(num < StoreCnt, 'Invalid store number', true) then + if checkFails(num < StoreCnt, 'Invalid ammo store number', true) then GetAmmoByNum:= nil else GetAmmoByNum:= StoresList[num] diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uInputHandler.pas --- a/hedgewars/uInputHandler.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uInputHandler.pas Tue Jul 17 19:44:29 2018 +0200 @@ -109,7 +109,7 @@ else begin code:= 0; while (code <= High(CurrentBinds.indices)) and (CurrentBinds.indices[code] <> index) do inc(code); - checkFails(code <= High(CurrentBinds.indices), 'binds registry inconsistency', True); + checkFails(code <= High(CurrentBinds.indices), 'Inconsistency in key binding registry', True); KeyBindToCode:= code; end; end; @@ -333,7 +333,7 @@ procedure RegisterBind(var binds: TBinds; key, value: shortstring); var code: LongInt; begin - checkFails(binds.lastIndex < 255, 'too many binds', true); + checkFails(binds.lastIndex < 255, 'Too many key bindings', true); code:= KeyNameToCode(key); diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uLand.pas --- a/hedgewars/uLand.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uLand.pas Tue Jul 17 19:44:29 2018 +0200 @@ -974,7 +974,7 @@ if digest = '' then digest:= s else - checkFails(s = digest, 'Different map or critical resources loaded, sorry', true); + checkFails(s = digest, 'Loaded map or other critical resource does not match across all players', true); end; procedure chSendLandDigest(var s: shortstring); diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uMatrix.pas --- a/hedgewars/uMatrix.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uMatrix.pas Tue Jul 17 19:44:29 2018 +0200 @@ -260,7 +260,7 @@ write(Result[i, j]); writeln; end; - checkFails(false, 'error in matrix multiplication?!', true); + checkFails(false, 'Error in matrix multiplication?!', true); end; {$ENDIF} diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uStore.pas --- a/hedgewars/uStore.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uStore.pas Tue Jul 17 19:44:29 2018 +0200 @@ -829,7 +829,7 @@ {$ENDIF} end; - if checkFails((ProgrTex <> nil) and (LoadingText <> nil), 'Error - Progress or Loading Texture is nil!', true) then exit; + if checkFails((ProgrTex <> nil) and (LoadingText <> nil), 'Error - Progress or Loading texture is nil!', true) then exit; RenderClear(); if Step < numsquares then diff -r 4f00b08d6f1e -r c41b16ac2e05 hedgewars/uTeams.pas --- a/hedgewars/uTeams.pas Tue Jul 17 19:28:31 2018 +0200 +++ b/hedgewars/uTeams.pas Tue Jul 17 19:44:29 2018 +0200 @@ -148,7 +148,7 @@ PrevHH, PrevTeam : LongWord; begin TargetPoint.X:= NoPointX; -if checkFails(CurrentTeam <> nil, 'nil Team', true) then exit; +if checkFails(CurrentTeam <> nil, 'Team is nil!', true) then exit; with CurrentHedgehog^ do if (PreviousTeam <> nil) and PlacingHogs and Unplaced then begin