aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-03-07 19:53:00 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2009-03-07 19:53:00 +0000
commitb38fa5a07ab1f5604372176c8e84ddfb075133ee (patch)
treeb3c1b8bd500473865cf115451a62d7b7aeaef5c5
parent458111738476004a914af6fd3e117eb84a35ab6a (diff)
downloadusdx-b38fa5a07ab1f5604372176c8e84ddfb075133ee.tar.gz
usdx-b38fa5a07ab1f5604372176c8e84ddfb075133ee.tar.xz
usdx-b38fa5a07ab1f5604372176c8e84ddfb075133ee.zip
unclutter Umain: ConversionFileName moved to UScreenEditConvert
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1626 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/base/UMain.pas2
-rw-r--r--src/screens/UScreenEditConvert.pas3
-rw-r--r--src/screens/UScreenOpen.pas1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/base/UMain.pas b/src/base/UMain.pas
index bc1cc7cc..7cd69c24 100644
--- a/src/base/UMain.pas
+++ b/src/base/UMain.pas
@@ -91,8 +91,6 @@ type
var
Done: boolean;
- // FIXME: ConversionFileName should not be global
- ConversionFileName: string;
Restart: boolean;
// player and music info
diff --git a/src/screens/UScreenEditConvert.pas b/src/screens/UScreenEditConvert.pas
index 8ef43770..89fd64c5 100644
--- a/src/screens/UScreenEditConvert.pas
+++ b/src/screens/UScreenEditConvert.pas
@@ -116,6 +116,9 @@ type
procedure onHide; override;
end;
+var
+ ConversionFileName: string;
+
implementation
uses
diff --git a/src/screens/UScreenOpen.pas b/src/screens/UScreenOpen.pas
index c4d773e7..fe9f0664 100644
--- a/src/screens/UScreenOpen.pas
+++ b/src/screens/UScreenOpen.pas
@@ -74,6 +74,7 @@ uses
UGraphic,
UDraw,
UMain,
+ UScreenEditConvert,
USkins;
function TScreenOpen.ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean;