From 27fff2aadae7b7be576005acd8fa94c8006d6f4b Mon Sep 17 00:00:00 2001 From: bm98 Date: Mon, 26 Oct 2015 23:06:04 +0100 Subject: [PATCH] Fix for alpha AC 1.3: substitute removed js1_ or xi_ mark in defaultProfile to make it no longer bailing out on init Everything else is not checked or changed in this build. --- Joystick/DProfileReader.cs | 10 ++++++++-- Properties/AssemblyInfo.cs | 4 ++-- SCJMapper-V2.csproj | 4 ++-- doc/ReadMe.txt | 14 ++++++++++---- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Joystick/DProfileReader.cs b/Joystick/DProfileReader.cs index c5a6eac..307f443 100644 --- a/Joystick/DProfileReader.cs +++ b/Joystick/DProfileReader.cs @@ -86,7 +86,10 @@ private void CollectActions( XmlReader xr, Dictionary attr ) ac.input = "J"; ac.defBinding = attr["joystick"]; if ( ac.defBinding == " " ) ac.defBinding = JoystickCls.BlendedInput; - if ( !String.IsNullOrEmpty( ac.defBinding ) ) m_currentMap.Add( ac ); // finally add it to the current map if it was bound + if ( !String.IsNullOrEmpty( ac.defBinding ) ) { + if ( !ac.defBinding.StartsWith( "js1_" ) && !ac.defBinding.StartsWith( "jsx_" ) ) ac.defBinding = "js1_" + ac.defBinding; // fix AC 1.3 + m_currentMap.Add( ac ); // finally add it to the current map if it was bound + } } if ( attr.ContainsKey( "keyboard" ) ) { Action ac = new Action( ); @@ -102,7 +105,10 @@ private void CollectActions( XmlReader xr, Dictionary attr ) ac.input = "X"; ac.defBinding = attr["xboxpad"]; if ( ac.defBinding == " " ) ac.defBinding = GamepadCls.BlendedInput; - if ( !String.IsNullOrEmpty( ac.defBinding ) ) m_currentMap.Add( ac ); // finally add it to the current map if it was bound + if ( !String.IsNullOrEmpty( ac.defBinding ) ) { + if ( !ac.defBinding.StartsWith( "xi_" ) ) ac.defBinding = "xi_" + ac.defBinding; // fix AC 1.3 + m_currentMap.Add( ac ); // finally add it to the current map if it was bound + } } if ( attr.ContainsKey( "ps3pad" ) ) { Action ac = new Action( ); diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index f80954a..59207c2 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion( "2.15.0.48" )] -[assembly: AssemblyFileVersion( "2.15.0.48" )] +[assembly: AssemblyVersion( "2.16.0.49" )] +[assembly: AssemblyFileVersion( "2.16.0.49" )] diff --git a/SCJMapper-V2.csproj b/SCJMapper-V2.csproj index 560b6bf..e30e911 100644 --- a/SCJMapper-V2.csproj +++ b/SCJMapper-V2.csproj @@ -26,8 +26,8 @@ false false true - 48 - 2.15.0.%2a + 49 + 2.16.0.%2a false true diff --git a/doc/ReadMe.txt b/doc/ReadMe.txt index 98cd721..68dab32 100644 --- a/doc/ReadMe.txt +++ b/doc/ReadMe.txt @@ -1,10 +1,10 @@ -SC Joystick Mapper V 2.14 - Build 47 BETA -(c) Cassini, StandardToaster - 09-May-2015 +SC Joystick Mapper V 2.16 - Build 49 BETA +(c) Cassini, StandardToaster - 26-October-2015 Contains 9 files: -SCJMapper.exe The program (V2.14) -SCJMapper.exe.config Program config (V2.14) - MUST be in the same folder as the Exe file +SCJMapper.exe The program (V2.16) +SCJMapper.exe.config Program config (V2.16) - MUST be in the same folder as the Exe file SharpDX.DirectInput.dll Managed DirectInput Assembly - MUST be in the same folder as the Exe file SharpDX.dll Managed DirectX Assembly - MUST be in the same folder as the Exe file OpenTK.dll Managed OpenGL Assembly - MUST be in the same folder as the Exe file @@ -29,6 +29,12 @@ Scanned for viruses before packing... cassini@burri-web.org Changelog: +V 2.16 - BETA Build 49 +- update - Updated for AC Alpha 1.3 defaultProfile does no longer have js1_ or xi_ marks form commands +- NOTE: - Dump Log does not work right now as CIG does no longer list detected controllers in the log file +V 2.15 - BETA Build 48 +- update - Updated for AC Alpha 1.1.6 new files locations to find files and mappings +- NOTE: - Dump Log does not work right now as CIG does no longer list detected controllers in the log file V 2.14 - BETA Build 47 - update - added new defaultProfile (CIG allows some more joystick mappings) V 2.13 - BETA Build 46