From ceae3d4f3b8d1697ec345787b35064f96fc67e14 Mon Sep 17 00:00:00 2001
From: jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sat, 12 Jan 2008 12:49:16 +0000
Subject: oops... :)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@791 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
Game/Code/Classes/UPlatformMacOSX.pas | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'Game/Code')
diff --git a/Game/Code/Classes/UPlatformMacOSX.pas b/Game/Code/Classes/UPlatformMacOSX.pas
index 97c32fe3..30a2ab47 100644
--- a/Game/Code/Classes/UPlatformMacOSX.pas
+++ b/Game/Code/Classes/UPlatformMacOSX.pas
@@ -15,17 +15,13 @@ type
TPlatformMacOSX = class( TInterfacedObject, IPlatform)
private
public
-<<<<<<< .mine
Function DirectoryFindFiles(Dir, Filter : WideString; ReturnAllSubDirs : Boolean) : TDirectoryEntryArray; override;
function GetGamePath: WideString; override;
function TerminateIfAlreadyRunning(var WndTitle : String) : Boolean;
procedure halt();
-=======
- function DirectoryFindFiles(Dir, Filter : WideString; ReturnAllSubDirs : Boolean) : TDirectoryEntryArray; override;
- function GetLogPath : WideString; override;
- function GetGameSharedPath : WideString; override;
- function GetGameUserPath : WideString; override;
->>>>>>> .r788
+ function GetLogPath : WideString; override;
+ function GetGameSharedPath : WideString; override;
+ function GetGameUserPath : WideString; override;
end;
implementation
@@ -52,6 +48,7 @@ end;
function TPlatformMacOSX.GetLogPath : WideString;
begin
+ // surly logs go in /var/log/ ???
Result := GetBundlePath;
end;
@@ -62,6 +59,8 @@ end;
function TPlatformMacOSX.GetGameUserPath : WideString;
begin
+ // is there no user profile ???
+ // like ... /home/user/ that could be used for song locations etc ??
Result := GetBundlePath;
end;
--
cgit v1.2.3