aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-20 03:24:19 +0000
committerjaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>2008-02-20 03:24:19 +0000
commit2c57e4b07526db9a959174d6f91688f34608824d (patch)
treecf59b64faed06f0ea373e75f5791049d9b158fe8
parentf4537c94794d456d4b7157efeeca2509363bdbb8 (diff)
downloadusdx-2c57e4b07526db9a959174d6f91688f34608824d.tar.gz
usdx-2c57e4b07526db9a959174d6f91688f34608824d.tar.xz
usdx-2c57e4b07526db9a959174d6f91688f34608824d.zip
fixed that damn bug with the NG path hack... grrr
sorry .. also fixed FPC compile error in UVideo. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@866 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Game/Code/Classes/USongs.pas3
-rw-r--r--Game/Code/Classes/UVideo.pas2
2 files changed, 3 insertions, 2 deletions
diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index b502f703..ce6275e8 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -233,10 +233,11 @@ begin
if UserSongPath <> SongPath then
BrowseDir(UserSongPath);
+(*
if ( cUSNGPath <> SongPath ) AND
( cUSNGPath <> UserSongPath ) then
BrowseDir( cUSNGPath ); // todo : JB this is REAL messy,
- // we should have some sort of path manager that lets us specify X number of extra paths to search
+*) // we should have some sort of path manager that lets us specify X number of extra paths to search
if assigned( CatSongs ) then
CatSongs.Refresh;
diff --git a/Game/Code/Classes/UVideo.pas b/Game/Code/Classes/UVideo.pas
index b48f89c5..1ba72311 100644
--- a/Game/Code/Classes/UVideo.pas
+++ b/Game/Code/Classes/UVideo.pas
@@ -224,7 +224,7 @@ begin
{$endif}
// if (VideoTime <> 0) and (TimeDifference <= VideoTimeBase) then
- if (VideoTime <> 0) and flooptime = 0 then
+ if (VideoTime <> 0) and ( flooptime = 0 ) then
begin
{$ifdef DebugFrames}
// frame delay debug display