moved help IDs to a better place, i hope..

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2169 b956fd51-792f-4845-bead-9b4dfca2ff2c

27 files changed, 78 insertions, 81 deletions

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index e61cdca9..70b64ad2 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -111,12 +111,12 @@ type
       procedure onHide; override;

   end;

 

+const

+  ID='ID_001';   //for help system

+

 implementation

 uses UGraphic, UDraw, UMain, USkins, ULanguage;

 

-const

-      ID='ID_001';   //for help system

-

 // Method for input parsing. If False is returned, GetNextWindow

 // should be checked to know the next window to load;

 function TScreenEditSub.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas
index 31b5046d..856e0cf1 100644
--- a/Game/Code/Screens/UScreenLevel.pas
+++ b/Game/Code/Screens/UScreenLevel.pas
@@ -7,16 +7,16 @@ uses
 

 type

   TScreenLevel = class(TMenu)

-    const

-      ID='ID_002';   //for help system

-

-    public

+  public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_002';   //for help system

+

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, ULog;

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index 4b6c58a4..91a9e620 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenMain = class(TMenu)

-    const

-      ID='ID_003';   //for help system

-

     public

       TextDescription:        integer;

       TextDescriptionLong:    integer;

@@ -28,6 +25,9 @@ type
       //function Draw: boolean; override;

   end;

 

+const

+  ID='ID_003';   //for help system

+  

 implementation

 

 uses Windows, UPlaylist, UGraphic, UMain, UIni, UTexture, USongs, Textgl, opengl, ULanguage, UParty, UDLLManager, UScreenCredits, USkins, ULog;

diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index d754899b..4f6289c3 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenName = class(TMenu)

-    const

-      ID='ID_004';   //for help system

-

     public

       Goto_SingScreen: Boolean; //If True then next Screen in SingScreen

       constructor Create; override;

@@ -18,6 +15,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_004';   //for help system

+

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index 9e0f922b..f5a29054 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenOptions = class(TMenu)

-    const

-      ID='ID_006';   //for help system

-

     public

       TextDescription:    integer;

       constructor Create; override;

@@ -20,6 +17,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_006';   //for help system

+  

 implementation

 

 uses UGraphic, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index 18182153..c364ca20 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -7,15 +7,15 @@ uses
 

 type

   TScreenOptionsAdvanced = class(TMenu)

-    const

-      ID='ID_007';   //for help system

-

     public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

   end;

 

+const

+  ID='ID_007';   //for help system

+  

 implementation

 

 uses UGraphic, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index 29c36330..8aadb27a 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenOptionsGame = class(TMenu)

-    const

-      ID='ID_008';   //for help system

-

     public

       old_Tabs, old_Sorting: integer;

       constructor Create; override;

@@ -18,6 +15,9 @@ type
       procedure RefreshSongs;

   end;

 

+const

+  ID='ID_008';   //for help system

+  

 implementation

 

 uses UGraphic, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index 688d95ad..58e40c23 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -7,14 +7,14 @@ uses
 

 type

   TScreenOptionsGraphics = class(TMenu)

-    const

-      ID='ID_009';   //for help system

-

     public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

-  end;

+    end;

+

+const

+  ID='ID_009';   //for help system

 

 implementation

 

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index 4d6cdf2d..aeeb01a4 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -7,15 +7,15 @@ uses
 

 type

   TScreenOptionsLyrics = class(TMenu)

-    const

-      ID='ID_010';   //for help system

-      

     public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

   end;

 

+const

+  ID='ID_010';   //for help system

+  

 implementation

 

 uses UGraphic, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index 9f75f78a..8b3df639 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenOptionsRecord = class(TMenu)

-    const

-      ID='ID_011';   //for help system

-

     private

       SelectSlideInput:       integer;

       SelectSlideChannelL:    integer;

@@ -21,6 +18,9 @@ type
       procedure UpdateCard;

   end;

 

+const

+  ID='ID_011';   //for help system

+  

 implementation

 

 uses SysUtils, UGraphic, URecord, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index dc465e0f..f2b94e73 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -7,15 +7,15 @@ uses
 

 type

   TScreenOptionsSound = class(TMenu)

-    const

-      ID='ID_012';   //for help system

-

     public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

       procedure onShow; override;

   end;

 

+const

+  ID='ID_012';   //for help system

+  

 implementation

 

 uses UGraphic, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index ce156446..320baa83 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenOptionsThemes = class(TMenu)

-    const

-      ID='ID_013';   //for help system

-

     private

       procedure ReloadTheme;

     public

@@ -21,6 +18,9 @@ type
       procedure InteractDec; override;

   end;

 

+const

+  ID='ID_013';   //for help system

+

 implementation

 

 uses UGraphic, USkins, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index 45e3be8d..91ae0e64 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyNewRound = class(TMenu)

-    const

-      ID='ID_014';   //for help system

-

     private

       ScreenRound:  Integer;

       procedure Update;

@@ -52,6 +49,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_014';   //for help system

+  

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, UParty, UDLLManager, ULanguage, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenPartyNewRoundM2.pas b/Game/Code/Screens/UScreenPartyNewRoundM2.pas
index f25b928f..ee5c8a90 100644
--- a/Game/Code/Screens/UScreenPartyNewRoundM2.pas
+++ b/Game/Code/Screens/UScreenPartyNewRoundM2.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyNewRoundM2 = class(TMenu)

-    const

-      ID='ID_019';   //for help system

-

     public

       //Texts:

       TextRound: array [1..9] of cardinal;

@@ -41,6 +38,9 @@ type
       procedure Update;

   end;

 

+const

+  ID='ID_019';   //for help system

+  

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, UPartyM2, UDLLManager, ULanguage, ULog, UHelp;

diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 7baa3743..d6c2d71a 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyOptions = class(TMenu)

-    const

-      ID='ID_015';   //for help system

-

     public

       SelectLevel: Cardinal;

       SelectPlayList: Cardinal;

@@ -51,6 +48,7 @@ const
     '11', '12', '13', '14', '15', '16', '17', '18', '19', '20',

     '21', '22', '23', '24', '25', '26', '27', '28', '29', '30',

     '31', '32');

+  ID='ID_015';   //for help system

 

 implementation

 

diff --git a/Game/Code/Screens/UScreenPartyOptionsM2.pas b/Game/Code/Screens/UScreenPartyOptionsM2.pas
index 465fb5b0..472b2c16 100644
--- a/Game/Code/Screens/UScreenPartyOptionsM2.pas
+++ b/Game/Code/Screens/UScreenPartyOptionsM2.pas
@@ -17,9 +17,6 @@ uses
 

 type

   TScreenPartyOptionsM2 = class(TMenu)

-    const

-      ID='ID_020';   //for help system

-

     public

       ID_DUELL:         Byte;

       SelectLevel:      cardinal;

@@ -64,6 +61,7 @@ var
 const

   IPlayers: array[0..7] of String = ('2', '3', '4', '5', '6', '7', '8', '9');

   MAX_ROUNDS: Integer = 100;

+  ID='ID_020';   //for help system

 

 implementation

 

diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index 70e08adb..750d8963 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyPlayer = class(TMenu)

-    const

-      ID='ID_016';   //for help system

-

     public

       Team1Name: Cardinal;

       Player1Name: Cardinal;

@@ -35,6 +32,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_016';   //for help system

+

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, UParty, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenPartyPlayerM2.pas b/Game/Code/Screens/UScreenPartyPlayerM2.pas
index 0486dfda..6ee9d1df 100644
--- a/Game/Code/Screens/UScreenPartyPlayerM2.pas
+++ b/Game/Code/Screens/UScreenPartyPlayerM2.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyPlayerM2 = class(TMenu)

-    const

-      ID='ID_021';   //for help system

-

     public

       constructor Create; override;

       function ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean; override;

@@ -17,6 +14,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_021';   //for help system

+

 implementation

 

 uses UGraphic, UMain, UIni, UTexture, UPartyM2, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 0979b3ba..faed2964 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyScore = class(TMenu)

-    const

-      ID='ID_017';   //for help system

-

     public

       TextScoreTeam1:    Cardinal;

       TextScoreTeam2:    Cardinal;

@@ -41,6 +38,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_017';   //for help system

+

 implementation

 

 uses UGraphic, UMain, UParty, UScreenSingModi, ULanguage, UTexture, USkins, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index e40a48d8..d7c26d30 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenPartyWin = class(TMenu)

-    const

-      ID='ID_018';   //for help system

-

     public

       TextScoreTeam1:    Cardinal;

       TextScoreTeam2:    Cardinal;

@@ -34,6 +31,9 @@ type
       procedure SetAnimationProgress(Progress: real); override;

   end;

 

+const

+  ID='ID_018';   //for help system

+  

 implementation

 

 uses UGraphic, UMain, UParty, UScreenSingModi, ULanguage, UHelp, ULog;

diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index daeff363..ca2ec78b 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -12,9 +12,6 @@ type
   end;

 

   TScreenScore = class(TMenu)

-    const

-      ID='ID_022';   //for help system

-

     public

       MP3VolumeHandler: THandler;

 

@@ -66,10 +63,14 @@ type
       procedure StartVoice;

   end;

 

+const

+  ID='ID_022';   //for help system

+  

 implementation

 

 {{$IFDEF TRANSLATE}

 uses UGraphic, UDraw, UScreenSong, UPartyM2, UMenuStatic, UTime, UMain, UIni, ULanguage, UHelp, ULog;

+

 {{$ELSE}{

 uses UGraphic, UScreenSong, UMenuStatic, UTime, UMain, UIni;

 {{$ENDIF}

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 0469a017..22f8c8ac 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -12,9 +12,6 @@ type
   end;

 

   TScreenSing = class(TMenu)

-    const

-      ID='ID_023';   //for help system

-      

     protected

       paused: boolean; //Pause Mod

       PauseTime: Real;

@@ -110,10 +107,13 @@ type
       procedure DrawMedleyCountdown();

   end;

 

+const

+  ID='ID_023';   //for help system

+

 implementation

 uses UGraphic, UDataBase, UDraw, UMain, Classes, URecord, ULanguage, UHelp, math,

   UPartyM2, UParty;

-

+  

 // Method for input parsing. If False is returned, GetNextWindow

 // should be checked to know the next window to load;

 function TScreenSing.ParseInput(PressedKey: Cardinal; ScanCode: byte; PressedDown: Boolean): Boolean;

diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index 95610ee9..e1a24ddf 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -7,8 +7,6 @@ uses
 

 type

   TScreenSongJumpto = class(TMenu)

-  const

-      ID='ID_031';   //for help system

     private

       //For ChangeMusic

       LastPlayed: Integer;

@@ -34,6 +32,8 @@ var
   IType: Array [0..2] of String;

   SelectType: Integer;

 

+const

+  ID='ID_031';   //for help system

 

 implementation

 

diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
index 452c5cc2..09dfa642 100644
--- a/Game/Code/Screens/UScreenStatDetail.pas
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenStatDetail = class(TMenu)

-    const

-      ID='ID_027';   //for help system

-

     public

       Typ:  Byte;

       Page: CardinaL;

@@ -29,6 +26,9 @@ type
       Procedure SetPage(NewPage: Cardinal);

   end;

 

+const

+  ID='ID_027';   //for help system

+

 implementation

 

 {Stat Screens:

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
index 8f5c3cd1..b82e655c 100644
--- a/Game/Code/Screens/UScreenStatMain.pas
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -7,9 +7,6 @@ uses
 

 type

   TScreenStatMain = class(TMenu)

-    const

-      ID='ID_028';   //for help system

-

     private

       //Some Stat Value that don't need to be calculated 2 times

       SongswithVid: Cardinal;

@@ -23,6 +20,9 @@ type
       procedure SetOverview;

   end;

 

+const

+  ID='ID_028';   //for help system

+  

 implementation

 

 uses UGraphic, UDataBase, USongs, ULanguage, windows, ULog, UHelp;

diff --git a/Game/Code/Screens/UScreenTop.pas b/Game/Code/Screens/UScreenTop.pas
index 6279458f..57005d95 100644
--- a/Game/Code/Screens/UScreenTop.pas
+++ b/Game/Code/Screens/UScreenTop.pas
@@ -12,9 +12,6 @@ type
   end;

 

   TScreenTop = class(TMenu)

-    const

-      ID='ID_029';   //for help system

-

     public

       MP3VolumeHandler: THandler;

 

@@ -38,6 +35,9 @@ type
       //procedure DrawScores(difficulty: integer);  TODO

   end;

 

+const

+  ID='ID_029';   //for help system

+  

 implementation

 

 uses UGraphic, UDataBase, UDraw, UMain, UIni, UPartyM2, UTime, DateUtils, UHelp, ULog;

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 6e0f385a..3bc4f936 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -124,7 +124,7 @@ uses
   acinerella in 'lib\acinerella\acinerella.pas';

 

 const

-  Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 5 2010-03-02';

+  Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 beta 6 2010-03-03';

 

 var

   WndTitle: string;