Fixed some Bugs from Previous Commit

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

2 files changed, 12 insertions, 8 deletions

diff --git a/Game/Code/Classes/UCore.pas b/Game/Code/Classes/UCore.pas
index 744fabe2..990ee7ab 100644
--- a/Game/Code/Classes/UCore.pas
+++ b/Game/Code/Classes/UCore.pas
@@ -31,8 +31,8 @@ type
       hExit:            THandle;

       hDebug:           THandle;

       hError:           THandle;

-      sgiveError:       THandle;

-      sgiveDebug:       THandle;

+      sReportError:       THandle;

+      sReportDebug:       THandle;

 

       Modules:          Array [0..High(CORE_MODULES_TO_LOAD)] of TModuleListItem;

 

@@ -81,8 +81,8 @@ type
       // Hook and Service Procs:

       //--------------

       Function ShowMessage(wParam, lParam: DWord): integer; //Shows a Message (lParam: PChar Text, wParam: Symbol)

-      Function ShowMessage(wParam, lParam: DWord): integer; //Shows a Message (lParam: PChar Text, wParam: Symbol)

-      Function ShowMessage(wParam, lParam: DWord): integer; //Shows a Message (lParam: PChar Text, wParam: Symbol)

+      {Function ShowMessage(wParam, lParam: DWord): integer; //Shows a Message (lParam: PChar Text, wParam: Symbol)

+      Function ShowMessage(wParam, lParam: DWord): integer; //Shows a Message (lParam: PChar Text, wParam: Symbol)}

   end;

 

 var

@@ -178,6 +178,8 @@ end;
 //Inits Core and all Modules

 //-------------

 Function TCore.Init: Boolean;

+var

+  I: Integer;

 begin

   Result := InitCore;

 

@@ -193,8 +195,9 @@ end;
 //DeInits Core and all Modules

 //-------------

 Function TCore.DeInit: Boolean;

-

-  label Continue;

+var

+  I: Integer;

+label Continue;

 begin

   I := High(CORE_MODULES_TO_LOAD);

 

@@ -209,8 +212,10 @@ begin
     end;

   Except

 

-    GoTo Continue;

+

   end;

+  If (I >= 0) then

+    GoTo Continue;

 

   DeInitCore;

 end;

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index b154c653..ed58e97f 100644
--- a/Game/Code/UltraStar.dpr
+++ b/Game/Code/UltraStar.dpr
@@ -188,7 +188,6 @@ begin
         Inc(I);

         hWnd := FindWindow(nil, PChar(WndTitle + ' Instance ' + InttoStr(I)));

       until (hWnd = 0);

-      MessageBox(

       WndTitle := WndTitle + ' Instance ' + InttoStr(I);

     end

     else