Should now function with lape correctly.

SRL · Oct 16, 2013 · 6ad6f71 · 6ad6f71
1 parent 16e8b6d
commit 6ad6f71
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 44 deletions.
diff --git a/SRL.simba b/SRL.simba
@@ -21,9 +21,6 @@
 //--        Low Level SCAR Math, Mouse Movement and Color routines.         --//
 //----------------------------------------------------------------------------//
 
-// For development:
-//{$DEFINE CompileSRL}
-
 {$DEFINE SRL5}
 
 {$IFDEF PascalScript}
@@ -200,18 +197,6 @@ begin
 
   SetupGauss;
   Proc_WorldSwitcherEnabled;
-  if Length(Players) > 0 then
-  SetScreenName(Players[CurrentPlayer].Nick);
+  if (Length(Players) > 0) then
+    SetScreenName(Players[CurrentPlayer].Nick);
 end;
-
-{$ifdef CompileSRL}
-begin
-  SetupSRL;
-end.
-{$endif}
-
-{$ifdef LAPE}
-begin
-  SetupSRL;
-end.
-{$endif}
diff --git a/SRLLape.simba b/SRLLape.simba
@@ -52,32 +52,22 @@ begin
 end;
 
 const
-  GetTickCount_StartTime := GetTickCount;
-
-function GetTickCount: UInt32; override;
-begin
-  Result := inherited() - GetTickCount_StartTime;
-end;
-
-function GetSystemTime: LongWord; override;
-begin
-  Result := GetTickCount;
-end;
-
-procedure TerminateScript; override;
-begin
-  Halt();
-end;
-
-const
-  clWhite = 16777215;
-  clBlack = 0;
-
-  clRed   = 255;
-  clGreen = 32768;
-  clBlue  = 16711680;
-
-  clPurple = 8388736;
-  clYellow = 65535;
+  clWhite   = 16777215;
+  clBlack   = 0;
+  clRed     = 255;
+  clGreen   = 32768;
+  clBlue    = 16711680;
+  clPurple  = 8388736;
+  clYellow  = 65535;
+  clAqua    = 16776960;
+  clOrange  = 26367;
+  clFuchsia = 16711935;
+  clTeal    = 8421376;
+  clNavy    = 8388608;
+  clGray    = 8421504;
+  clLime    = 65280;
+  clMaroon  = 128;
+  clSilver  = 12632256;
+  clPink    = 11772650;
 
   MaxInt = High(Integer);