From 1ab628e8ad6c85c8f1b562f10480253ee3e622b7 Mon Sep 17 00:00:00 2001
From: whiteshark0 <whiteshark0@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 11 Dec 2009 17:34:54 +0000
Subject: merged trunk into lua branch plugin loading is disabled atm because
 of a bug reading the files (lua may be the reason). Reading the files in usdx
 and passing the contents to lua may solve this

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@2019 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Lua/src/base/UCommandLine.pas | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'Lua/src/base/UCommandLine.pas')

diff --git a/Lua/src/base/UCommandLine.pas b/Lua/src/base/UCommandLine.pas
index 281a480d..ac0db2c2 100644
--- a/Lua/src/base/UCommandLine.pas
+++ b/Lua/src/base/UCommandLine.pas
@@ -33,6 +33,9 @@ interface
 
 {$I switches.inc}
 
+uses
+  UPath;
+
 type
   TScreenMode = (scmDefault, scmFullscreen, scmWindowed);
 
@@ -64,9 +67,9 @@ type
       Screens:    integer;
 
       // some strings set when reading infos {Length=0: Not Set}
-      SongPath:   string;
-      ConfigFile: string;
-      ScoreFile:  string;
+      SongPath:   IPath;
+      ConfigFile: IPath;
+      ScoreFile:  IPath;
 
       // pseudo integer values
       property Language:      integer read GetLanguage;
@@ -144,9 +147,9 @@ begin
   Screens     := -1;
 
   // some strings set when reading infos {Length=0 Not Set}
-  SongPath    := '';
-  ConfigFile  := '';
-  ScoreFile   := '';
+  SongPath    := PATH_NONE;
+  ConfigFile  := PATH_NONE;
+  ScoreFile   := PATH_NONE;
 end;
 
 {**
@@ -248,7 +251,7 @@ begin
         if (PCount > I) then
         begin
           // write value to string
-          SongPath := ParamStr(I + 1);
+          SongPath := Path(ParamStr(I + 1));
         end;
       end
 
@@ -258,11 +261,11 @@ begin
         if (PCount > I) then
         begin
           // write value to string
-          ConfigFile := ParamStr(I + 1);
+          ConfigFile := Path(ParamStr(I + 1));
 
           // is this a relative path -> then add gamepath
-          if Not ((Length(ConfigFile) > 2) AND (ConfigFile[2] = ':')) then
-            ConfigFile := ExtractFilePath(ParamStr(0)) + Configfile;
+          if (not ConfigFile.IsAbsolute) then
+            ConfigFile := Platform.GetExecutionDir().Append(ConfigFile);
         end;
       end
 
@@ -272,7 +275,7 @@ begin
         if (PCount > I) then
         begin
           // write value to string
-          ScoreFile := ParamStr(I + 1);
+          ScoreFile := Path(ParamStr(I + 1));
         end;
       end;
 
-- 
cgit v1.2.3