diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 15:09:32 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-12-29 15:09:32 +0000 |
| commit | 66cae6a143822a4b3f596717d2671db910026054 (patch) | |
| tree | 27ab9140c03a3271ae13a3b4b4bec14ee159174a /Lua/src/base | |
| parent | f703eb192dce8d90ce09e6d92892fd788b4af3b7 (diff) | |
| download | usdx-66cae6a143822a4b3f596717d2671db910026054.tar.gz usdx-66cae6a143822a4b3f596717d2671db910026054.tar.xz usdx-66cae6a143822a4b3f596717d2671db910026054.zip | |
merged r2056 into lua branch
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2057 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Lua/src/base')
| -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 |