Added ability to display Videos only in full size and Backgrounds in half size.

Fullsize is now the standard value for Moviesize

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

3 files changed, 22 insertions, 7 deletions

diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas
index 41225c0d..2575758f 100644
--- a/Game/Code/Classes/UDraw.pas
+++ b/Game/Code/Classes/UDraw.pas
@@ -79,7 +79,7 @@ begin
   glClearColor (1, 1, 1, 1);

   glColor4f (1, 1, 1, 1);

 

-    if (Ini.MovieSize = 0) then  //HalfSize BG

+    if (Ini.MovieSize <= 1) then  //HalfSize BG

     begin

       (* half screen + gradient *)

       Rec.Top := 110; // 80

diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas
index 528966b3..ceb3c240 100644
--- a/Game/Code/Classes/UIni.pas
+++ b/Game/Code/Classes/UIni.pas
@@ -126,7 +126,7 @@ const
 

   ISpectrum:      array[0..1] of string = ('Off', 'On');

   ISpectrograph:  array[0..1] of string = ('Off', 'On');

-  IMovieSize:     array[0..1] of string = ('Half', 'Full');

+  IMovieSize:     array[0..2] of string = ('Half', 'Full [Vid]', 'Full [BG+Vid]');

 

   IMicBoost:      array[0..3] of string = ('Off', '+6dB', '+12dB', '+18dB');

   IClickAssist:   array[0..1] of string = ('Off', 'On');

@@ -173,10 +173,10 @@ var
   Modes:      PPSDL_Rect;

   SR: TSearchRec; //Skin List Patch

 

-function GetFileName (S: String):String;

+  function GetFileName (S: String):String;

   begin

   //Result := copy (S,0,StrRScan (PChar(S),char('.'))+1);

-  Result := copy (S,0,Pos ('.ini',S)-1);

+    Result := copy (S,0,Pos ('.ini',S)-1);

   end;

 

 begin

@@ -293,7 +293,7 @@ begin
     if Tekst = ISpectrograph[Pet] then Ini.Spectrograph := Pet;

 

   // MovieSize

-  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[0]);

+  Tekst := IniFile.ReadString('Graphics', 'MovieSize', IMovieSize[2]);

   for Pet := 0 to High(IMovieSize) do

     if Tekst = IMovieSize[Pet] then Ini.MovieSize := Pet;

 

@@ -349,12 +349,25 @@ begin
   // Theme

 

   //Theme List Patch

+

+    //I2 Saves the no of the Deluxe (Standard-) Theme

+    I2 := 0;

+    //I counts is the cur. Theme no

+    I := 0;

+

     SetLength(ITheme, 0);

     FindFirst('Themes\*.ini',faAnyFile,SR);

     Repeat

+      //Read Themename from Theme

       ThemeIni := TMemIniFile.Create(SR.Name);

       Tekst := UpperCase(ThemeIni.ReadString('Theme','Name',GetFileName(SR.Name)));

       ThemeIni.Free;

+

+      //if Deluxe Theme then save Themeno to I2

+      if (Tekst = 'DELUXE') then

+        I2 := I;

+

+      //Search for Skins for this Theme  

       for Pet := low(Skin.Skin) to high(Skin.Skin) do

       begin

         if UpperCase(Skin.Skin[Pet].Theme) = Tekst then

@@ -364,6 +377,8 @@ begin
           break;

         end;

       end;

+

+      Inc(I);

     Until FindNext(SR) <> 0;

     FindClose(SR);

   //Theme List Patch End }

@@ -375,7 +390,7 @@ begin
   end;

 

 

-  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[0]);

+  Tekst := IniFile.ReadString('Themes',    'Theme',   ITheme[I2]);

   Ini.Theme := 0;

   for Pet := 0 to High(ITheme) do

     if Uppercase(Tekst) = Uppercase(ITheme[Pet]) then Ini.Theme := Pet;

diff --git a/Game/Code/SMpeg/USmpeg.pas b/Game/Code/SMpeg/USmpeg.pas
index 85f3f988..317b04bb 100644
--- a/Game/Code/SMpeg/USmpeg.pas
+++ b/Game/Code/SMpeg/USmpeg.pas
@@ -253,7 +253,7 @@ begin
     TexT := 110 / 600 * (textures.movie_height / 1024{512});

     TexB := 490 / 600 * (textures.movie_height / 1024{512});

 

-    if Ini.MovieSize = 1 then begin

+    if Ini.MovieSize >= 1 then begin

       // full screen size

       CropT := 0;

       CropB := 600;