From 21c1082f916cc9a4d7be625c132e02b1fc1d8012 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Thu, 23 Jul 2009 18:09:11 +0000
Subject: - IPath integration - BASS is now unicode compatible

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1875 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 unicode/src/screens/UScreenOpen.pas | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'unicode/src/screens/UScreenOpen.pas')

diff --git a/unicode/src/screens/UScreenOpen.pas b/unicode/src/screens/UScreenOpen.pas
index a25356ec..08024a22 100644
--- a/unicode/src/screens/UScreenOpen.pas
+++ b/unicode/src/screens/UScreenOpen.pas
@@ -34,10 +34,13 @@ interface
 {$I switches.inc}
 
 uses
+  Math,
+  SysUtils,
+  gl,
+  SDL,
+  UPath,
   UMenu,
   UMusic,
-  SDL,
-  SysUtils,
   UFiles,
   UTime,
   USongs,
@@ -46,8 +49,6 @@ uses
   UTexture,
   UMenuText,
   ULyrics,
-  Math,
-  gl,
   UThemes;
 
 type
@@ -55,10 +56,10 @@ type
     private
       TextF:          array[0..1] of integer;
       TextN:          integer;
+      fPath:          IPath;
     public
       Tex_Background: TTexture;
       FadeOut:        boolean;
-      Path:           string;
       BackScreen:     pointer;
       procedure AddBox(X, Y, W, H: real);
       constructor Create; override;
@@ -107,7 +108,7 @@ begin
       SDLK_ESCAPE:
         begin
           //Empty Filename and go to last Screen
-          ConversionFileName := '';
+          ConversionFileName := PATH_NONE;
           AudioPlayback.PlaySound(SoundLib.Back);
           FadeTo(BackScreen);
         end;
@@ -117,14 +118,14 @@ begin
           if (Interaction = 2) then
           begin
             //Update Filename and go to last Screen
-            ConversionFileName := Text[TextN].Text;
+            ConversionFileName := Path(Text[TextN].Text);
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(BackScreen);
           end
           else if (Interaction = 1) then
           begin
             //Empty Filename and go to last Screen
-            ConversionFileName := '';
+            ConversionFileName := PATH_NONE;
             AudioPlayback.PlaySound(SoundLib.Back);
             FadeTo(BackScreen);
           end;
@@ -176,7 +177,7 @@ begin
 
   // file name
   AddBox(20, 540, 500, 40);
-  TextN := AddText(50, 548, 0, 24, 0, 0, 0, ConversionFileName);
+  TextN := AddText(50, 548, 0, 24, 0, 0, 0, ConversionFileName.ToUTF8);
   AddInteraction(iText, TextN);
 
   // buttons
-- 
cgit v1.2.3