- revert to 1777

- Ocean.ini and SVN properties are not reverted

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1854 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 14 insertions, 20 deletions

diff --git a/unicode/src/base/UGraphic.pas b/unicode/src/base/UGraphic.pas
index 818e49aa..17175d02 100644
--- a/unicode/src/base/UGraphic.pas
+++ b/unicode/src/base/UGraphic.pas
@@ -198,14 +198,7 @@ var
     Tex_Score_NoteBarRound_Lightest : array [1..6] of TTexture;
 
     Tex_Score_Ratings               : array [0..7] of TTexture;
-
-  // arrows for SelectSlide
-    Tex_SelectS_ArrowL:  TTexture;
-    Tex_SelectS_ArrowR:  TTexture;
-
-  // textures for software mouse cursor
-    Tex_Cursor_Unpressed: TTexture;
-    Tex_Cursor_Pressed:   TTexture;
+    
 const
   Skin_BGColorR = 1;
   Skin_BGColorG = 1;
@@ -239,6 +232,17 @@ const
   Skin_OscG = 0;
   Skin_OscB = 0;
 
+  // TODO: add to theme ini file
+  Skin_LyricsT = 493;
+  Skin_LyricsUpperX = 80;
+  Skin_LyricsUpperW = 640;
+  Skin_LyricsUpperY = Skin_LyricsT;
+  Skin_LyricsUpperH = 41;
+  Skin_LyricsLowerX = 80;
+  Skin_LyricsLowerW = 640;
+  Skin_LyricsLowerY = Skin_LyricsT + Skin_LyricsUpperH + 1;
+  Skin_LyricsLowerH = 41;
+
   Skin_SpectrumT = 470;
   Skin_SpectrumBot = 570;
   Skin_SpectrumH = 100;
@@ -335,15 +339,6 @@ begin
   Tex_Ball              := Texture.LoadTexture(Skin.GetTextureFileName('Ball'),            TEXTURE_TYPE_TRANSPARENT, $FF00FF);
   Tex_Lyric_Help_Bar    := Texture.LoadTexture(Skin.GetTextureFileName('LyricHelpBar'),    TEXTURE_TYPE_TRANSPARENT, $FF00FF);
 
-  Tex_SelectS_ArrowL    := Texture.LoadTexture(Skin.GetTextureFileName('Select_ArrowLeft'),    TEXTURE_TYPE_TRANSPARENT, 0);
-  Tex_SelectS_ArrowR    := Texture.LoadTexture(Skin.GetTextureFileName('Select_ArrowRight'),    TEXTURE_TYPE_TRANSPARENT, 0);
-
-  Tex_Cursor_Unpressed  := Texture.LoadTexture(Skin.GetTextureFileName('Cursor'), TEXTURE_TYPE_TRANSPARENT, 0);
-
-  if (Skin.GetTextureFileName('Cursor_Pressed') <> '') then
-    Tex_Cursor_Pressed    := Texture.LoadTexture(Skin.GetTextureFileName('Cursor_Pressed'), TEXTURE_TYPE_TRANSPARENT, 0)
-  else
-    Tex_Cursor_Pressed.TexNum := 0;
 
   //TimeBar mod
   Tex_TimeProgress := Texture.LoadTexture(Skin.GetTextureFileName('TimeBar'));
@@ -502,7 +497,6 @@ begin
 
   Log.LogStatus('TDisplay.Create', 'UGraphic.Initialize3D');
   Display := TDisplay.Create;
-  //Display.SetCursor;
 
   //Log.BenchmarkEnd(2); Log.LogBenchmark('====> Creating Display', 2);
 
@@ -635,15 +629,15 @@ begin
   begin
     Log.LogStatus('SDL_SetVideoMode', 'Set Video Mode...   Full Screen');
     screen := SDL_SetVideoMode(W, H, (Depth+1) * 16, SDL_OPENGL or SDL_FULLSCREEN );
+    SDL_ShowCursor(0);
   end
   else
   begin
     Log.LogStatus('SDL_SetVideoMode', 'Set Video Mode...   Windowed');
     screen := SDL_SetVideoMode(W, H, 0, SDL_OPENGL or SDL_RESIZABLE);
+    SDL_ShowCursor(1);
   end;
 
-  SDL_ShowCursor(0);
-
   if (screen = nil) then
   begin
     Log.LogCritical('SDL_SetVideoMode Failed', 'Initialize3D');