diff options
| author | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-11-24 20:04:01 +0000 |
|---|---|---|
| committer | whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2009-11-24 20:04:01 +0000 |
| commit | 735a5b67345e2888de89d89b4f31b4d48c06f9ec (patch) | |
| tree | d20a63bc11fcd76bee8d58ed7229bce5f3b62c27 /src/base | |
| parent | 12f978afaf1a2435ce2f94c19a73bcade3983d24 (diff) | |
| download | usdx-735a5b67345e2888de89d89b4f31b4d48c06f9ec.tar.gz usdx-735a5b67345e2888de89d89b4f31b4d48c06f9ec.tar.xz usdx-735a5b67345e2888de89d89b4f31b4d48c06f9ec.zip | |
use second players color to indicate selected note in editor
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1960 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/UGraphic.pas | 15 | ||||
| -rw-r--r-- | src/base/USong.pas | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/src/base/UGraphic.pas b/src/base/UGraphic.pas index 7738e010..b0e5a7d8 100644 --- a/src/base/UGraphic.pas +++ b/src/base/UGraphic.pas @@ -153,9 +153,9 @@ var ScreenPopupInfo: TScreenPopupInfo; //Notes - Tex_Left: array[0..6] of TTexture; //rename to tex_note_left - Tex_Mid: array[0..6] of TTexture; //rename to tex_note_mid - Tex_Right: array[0..6] of TTexture; //rename to tex_note_right + Tex_Left: array[1..6] of TTexture; //rename to tex_note_left + Tex_Mid: array[1..6] of TTexture; //rename to tex_note_mid + Tex_Right: array[1..6] of TTexture; //rename to tex_note_right Tex_plain_Left: array[1..6] of TTexture; //rename to tex_notebg_left Tex_plain_Mid: array[1..6] of TTexture; //rename to tex_notebg_mid @@ -299,15 +299,6 @@ var begin Log.LogStatus('Loading Textures', 'LoadTextures'); - // FIXME: do we need this? (REMOVE otherwise) - Tex_Left[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayLeft'), TEXTURE_TYPE_TRANSPARENT, 0); - // FIXME: do we need this? (REMOVE otherwise) - Tex_Mid[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayMid'), TEXTURE_TYPE_PLAIN, 0); - // FIXME: do we need this? (REMOVE otherwise) - Tex_Right[0] := Texture.LoadTexture(Skin.GetTextureFileName('GrayRight'), TEXTURE_TYPE_TRANSPARENT, 0); - - Log.LogStatus('Loading Textures - A', 'LoadTextures'); - // P1-6 // TODO... do it once for each player... this is a bit crappy !! // can we make it any better !? diff --git a/src/base/USong.pas b/src/base/USong.pas index 33e8d8df..f8d465c7 100644 --- a/src/base/USong.pas +++ b/src/base/USong.pas @@ -1206,6 +1206,8 @@ begin if Note[HighNote].Tone < BaseNote then BaseNote := Note[HighNote].Tone; + Note[HighNote].Color := 1; // default color to 1 for editor + DecodeStringUTF8(LyricS, Note[HighNote].Text, Encoding); Lyric := Lyric + Note[HighNote].Text; |