Bug #108 - Phyfs/Pathz: Fix binds not being loaded
authorsheepluva
Sat, 10 Dec 2016 19:09:25 +0100
changeset 12111 9bc19f722169
parent 12110 b50a5bde45fd
child 12112 0695302f3f5f
bug #108 - Phyfs/Pathz: Fix binds not being loaded
hedgewars/uInputHandler.pas
hedgewars/uTypes.pas
hedgewars/uVariables.pas
--- a/hedgewars/uInputHandler.pas	Wed Dec 07 13:25:04 2016 -0500
+++ b/hedgewars/uInputHandler.pas	Sat Dec 10 19:09:25 2016 +0100
@@ -321,7 +321,7 @@
     for i:= 1 to 10 do DefaultBinds[KeyNameToCode('f'+IntToStr(i))]:= 'slot '+char(48+i);
     for i:= 1 to 5  do DefaultBinds[KeyNameToCode(IntToStr(i))]:= 'timer '+IntToStr(i);
 
-    loadBinds('dbind', cPathz[ptData] + '/settings.ini');
+    loadBinds('dbind', cPathz[ptConfig] + '/settings.ini');
 end;
 
 
--- a/hedgewars/uTypes.pas	Wed Dec 07 13:25:04 2016 -0500
+++ b/hedgewars/uTypes.pas	Sat Dec 10 19:09:25 2016 +0100
@@ -42,7 +42,7 @@
     TGameType = (gmtLocal, gmtDemo, gmtNet, gmtSave, gmtLandPreview, gmtSyntax, gmtRecord);
 
     // Different files are stored in different folders, this enumeration is used to tell which folder to use
-    TPathType = (ptNone, ptData, ptGraphics, ptThemes, ptCurrTheme, ptTeams, ptMaps,
+    TPathType = (ptNone, ptData, ptGraphics, ptThemes, ptCurrTheme, ptConfig, ptTeams, ptMaps,
             ptMapCurrent, ptDemos, ptSounds, ptGraves, ptFonts, ptForts, ptLocale,
             ptAmmoMenu, ptHedgehog, ptVoices, ptHats, ptFlags, ptMissionMaps,
             ptSuddenDeath, ptButtons, ptShaders);
--- a/hedgewars/uVariables.pas	Wed Dec 07 13:25:04 2016 -0500
+++ b/hedgewars/uVariables.pas	Sat Dec 10 19:09:25 2016 +0100
@@ -273,7 +273,8 @@
         '/Graphics',                     // ptGraphics
         '/Themes',                       // ptThemes
         '/Themes/Bamboo',                // ptCurrTheme
-        '/Teams',                        // ptTeams
+        '/Config',                       // ptConfig
+        '/Config/Teams',                 // ptTeams
         '/Maps',                         // ptMaps
         '',                              // ptMapCurrent
         '/Demos',                        // ptDemos