gearhead2 (0.628-1) unixpaths

Index: gearhead2-0.621/arenascript.pp
===================================================================
--- gearhead2-0.621.orig/arenascript.pp	2010-02-10 14:50:19.000000000 +0200
+++ gearhead2-0.621/arenascript.pp	2010-02-10 14:50:53.000000000 +0200
@@ -36,7 +36,7 @@
 
 interface
 
-uses gears,locale,
+uses dos,gears,locale,
 {$IFDEF ASCII}
 	vidmenus,vidgfx;
 {$ELSE}
@@ -2303,7 +2303,7 @@
 		PC := PC^.Next;
 	end;
 
-	SaveStringList( FName + '.txt' , VList );
+	SaveStringList( GetEnv( 'HOME' ) + '/.gearhead2/' + FName + '.txt' , VList );
 	MoreText( VList , 1 );
 	DisposeSAtt( VList );
 end;
Index: gearhead2-0.621/gears.pp
===================================================================
--- gearhead2-0.621.orig/gears.pp	2010-02-10 14:51:03.000000000 +0200
+++ gearhead2-0.621/gears.pp	2010-02-10 15:45:19.000000000 +0200
@@ -234,16 +234,10 @@
 	{ fine. }
 	Default_File_Ending = '.txt';
 	Default_Search_Pattern = '*.txt';
-	Save_Game_DirName = 'savegame';
-	Save_Game_Directory = Save_Game_DirName + OS_Dir_Separator;
-	Save_Character_Base = Save_Game_Directory + 'CHA';
-	Save_Egg_Base = Save_Game_Directory + 'EGG';
-	Save_Unit_Base = Save_Game_Directory + 'GHU';
-	Save_Campaign_Base = Save_Game_Directory + 'RPG';
-	Design_DirName = 'design';
+	Design_DirName = '/usr/share/games/gearhead2/design';
 	Design_Directory = Design_DirName + OS_Dir_Separator;
 	PC_Equipment_Pattern = 'PC_*.txt';
-	Series_DirName = 'series';
+	Series_DirName = '/usr/share/games/gearhead2/series';
 	Series_Directory = Series_DirName + OS_Dir_Separator;
 	Archetypes_File = Series_Directory + 'ANPCdefault.txt';
 	Adventure_File_Base = Series_Directory + 'ADV_';
@@ -253,7 +247,7 @@
 
 	Monsters_File_Pattern = 'WMON_*.txt';
 
-	Data_DirName = 'gamedata';
+	Data_DirName = '/usr/share/games/gearhead2/gamedata';
 	Data_Directory = Data_DirName + OS_Dir_Separator;
 	MetaTerrain_File_Base = Data_Directory + 'meta';
 	Trait_Chatter_Base = Data_Directory + 'TC_';
@@ -273,13 +267,13 @@
 	RandMaps_Param_File = Data_Directory + 'randmaps.txt';
 	NPC_Chatter_File = Data_Directory + 'taunts.txt';
 
-	Doc_DirName = 'doc';
+	Doc_DirName = '/usr/share/games/gearhead2/doc';
 	Doc_Directory = Doc_DirName + OS_Dir_Separator;
 	Mecha_Help_File = Doc_Directory + 'man_umek.txt';
 	FieldHQ_Help_File = Doc_Directory + 'man_mecha.txt';
 	Chara_Help_File = Doc_Directory + 'man_chara.txt';
 
-	Config_File = 'gearhead.cfg';
+	Config_File = 'gearhead2.conf';
 
 	Graphics_DirName = 'image';
 	Graphics_Directory = Graphics_Dirname + OS_Dir_Separator;
@@ -288,6 +282,13 @@
 
 	STARTUP_OK: Boolean = True;
 
+	Save_Game_DirName: String = '';
+	Save_Game_Directory: String = '';
+	Save_Character_Base: String = '';
+	Save_Egg_Base: String = '';
+	Save_Unit_Base: String = '';
+	Save_Campaign_Base: String = '';
+
 Type
 	SAttPtr = ^SAtt;
 	SAtt = Record		{*** STRING ATTRIBUTE ***}
@@ -658,7 +659,7 @@
         FName: String;
 begin
 	SList := Nil;
-	FName := FSearch( FName_In , '.' );
+	FName := FSearch( FName_In , '/;/usr/share/games/gearhead2/' );
 	if FName <> '' then begin
 		Assign( F , FName );
 		Reset( F );
@@ -1385,10 +1386,24 @@
 Procedure CheckDirectoryPresent;
 	{ Make sure that the default save directory exists. If not, }
 	{ create it. }
+var
+	S: String;
 begin
-	if not DirectoryExists( Save_Game_DirName ) then begin
-		MkDir( Save_Game_DirName );
-	end;
+	S := GetEnv( 'HOME' ) + '/.gearhead2';
+	if not DirectoryExists( S ) then begin
+		MkDir( S );
+	end;
+	S := S + '/savegame2';
+	if not DirectoryExists( S ) then begin
+		MkDir( S );
+	end;
+
+	Save_Game_DirName := S;
+	Save_Game_Directory := Save_Game_DirName + OS_Dir_Separator;
+	Save_Character_Base := Save_Game_Directory + 'CHA';
+	Save_Egg_Base := Save_Game_Directory + 'EGG';
+	Save_Unit_Base := Save_Game_Directory + 'GHU';
+	Save_Campaign_Base := Save_Game_Directory + 'RPG';
 
 	{ Check to make sure all the other directories can be found. }
 	Startup_OK := DirectoryExists( Design_DirName );
Index: gearhead2-0.621/ui4gh.pp
===================================================================
--- gearhead2-0.621.orig/ui4gh.pp	2010-02-10 14:57:08.000000000 +0200
+++ gearhead2-0.621/ui4gh.pp	2010-02-10 14:57:47.000000000 +0200
@@ -443,7 +443,7 @@
 	T: Integer;
 begin
 	{See whether or not there's a configuration file.}
-	S := FSearch(Config_File,'.');
+	S := FSearch(Config_File, GetEnv('HOME')+'/.gearhead2/;/etc');
 	if S <> '' then begin
 		{ If we've found a configuration file, }
 		{ open it up and start reading. }
@@ -636,7 +636,7 @@
 begin
 	{ If we've found a configuration file, }
 	{ open it up and start reading. }
-	Assign( F , Config_File );
+	Assign( F , GetEnv('HOME')+'/.gearhead2/' + Config_File );
 	Rewrite( F );
 
 	writeln( F , '#' );