diff options
Diffstat (limited to '')
| -rw-r--r-- | Lua/src/base/USingScores.pas | 2 | ||||
| -rw-r--r-- | Lua/src/base/USong.pas | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Lua/src/base/USingScores.pas b/Lua/src/base/USingScores.pas index 56301539..6fdfaeb6 100644 --- a/Lua/src/base/USingScores.pas +++ b/Lua/src/base/USingScores.pas @@ -750,7 +750,7 @@ procedure TSingScores.DoRaiseScore(const Index: integer); const RaisePerSecond = 500; begin - S := (Players[Index].Score - Players[Index].ScoreDisplayed) + GetPopUpPoints(Index); + S := (Players[Index].Score - (Players[Index].ScoreDisplayed + GetPopUpPoints(Index))); if (S <> 0) then begin diff --git a/Lua/src/base/USong.pas b/Lua/src/base/USong.pas index fccf2757..705206c4 100644 --- a/Lua/src/base/USong.pas +++ b/Lua/src/base/USong.pas @@ -510,7 +510,9 @@ begin //Check for ZeroNote if Param2 = 0 then - Log.LogError('Found zero-length note at "'+Param0+' '+IntToStr(Param1)+' '+IntToStr(Param2)+' '+IntToStr(Param3)+ParamLyric+'" -> Note ignored!') + Log.LogWarn(Format('"%s" in line %d: %s', + [FileNamePath.ToNative, FileLineNo, 'found note with length zero -> note ignored']), 'TSong.LoadSong') + //Log.LogError('Found zero-length note at "'+Param0+' '+IntToStr(Param1)+' '+IntToStr(Param2)+' '+IntToStr(Param3)+ParamLyric+'" -> Note ignored!') else begin // add notes |