[mupen64plus-input-sdl] 131/196: Imported Upstream version 2.0~rc2+1+9aaeab081d97

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus-input-sdl.

commit 96d09f6c6976dd801b4fe09c743d43661a68055f
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jun 5 11:05:03 2013 +0200

    Imported Upstream version 2.0~rc2+1+9aaeab081d97
---
 projects/msvc11/mupen64plus-input-sdl.vcxproj |  2 ++
 src/config.c                                  | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/projects/msvc11/mupen64plus-input-sdl.vcxproj b/projects/msvc11/mupen64plus-input-sdl.vcxproj
index f317fb5..b165122 100644
--- a/projects/msvc11/mupen64plus-input-sdl.vcxproj
+++ b/projects/msvc11/mupen64plus-input-sdl.vcxproj
@@ -20,10 +20,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
diff --git a/src/config.c b/src/config.c
index 2d33ca7..b97fcea 100644
--- a/src/config.c
+++ b/src/config.c
@@ -538,6 +538,9 @@ void load_configuration(int bPreConfig)
     char DeviceName[4][256];
     int ActiveControllers = 0;
     int sdlNumJoysticks = get_sdl_num_joysticks();
+    float fVersion = 0.0f;
+    const char *sdl_name;
+    int ControllersFound = 0;
 
     /* tell user how many SDL joysticks are available */
     if (!bPreConfig)
@@ -559,7 +562,7 @@ void load_configuration(int bPreConfig)
             return;
         }
         /* Check version number, and if it doesn't match: delete the config section */
-        float fVersion = 0.0f;
+        fVersion = 0.0f;
         if (ConfigGetParameter(pConfig, "version", M64TYPE_FLOAT, &fVersion, sizeof(float)) != M64ERR_SUCCESS || ((int) fVersion) != ((int) CONFIG_VERSION))
         {
             DebugMessage(M64MSG_WARNING, "Missing or incompatible config section '%s'. Clearing.", SectionName);
@@ -664,7 +667,7 @@ void load_configuration(int bPreConfig)
             if (deviceAlreadyUsed)
                 continue;
             /* check if the name matches */
-            const char *sdl_name = get_sdl_joystick_name(sdlCtrlIdx);
+            sdl_name = get_sdl_joystick_name(sdlCtrlIdx);
             if (sdl_name != NULL && strncmp(DeviceName[n64CtrlIdx], sdl_name, 255) == 0)
             {
                 /* set up one or more controllers for this SDL device, if present in InputAutoConfig.ini */
@@ -705,8 +708,8 @@ void load_configuration(int bPreConfig)
             if (deviceAlreadyUsed)
                 continue;
             /* set up one or more controllers for this SDL device, if present in InputAutoConfig.ini */
-            const char *sdl_name = get_sdl_joystick_name(sdlCtrlIdx);
-            int ControllersFound = setup_auto_controllers(bPreConfig, n64CtrlIdx, sdlCtrlIdx, sdl_name, ControlMode, OrigControlMode, DeviceName);
+            sdl_name = get_sdl_joystick_name(sdlCtrlIdx);
+            ControllersFound = setup_auto_controllers(bPreConfig, n64CtrlIdx, sdlCtrlIdx, sdl_name, ControlMode, OrigControlMode, DeviceName);
             if (!bPreConfig && ControllersFound == 0)
                 DebugMessage(M64MSG_ERROR, "No auto-config found for joystick named '%s' in InputAutoConfig.ini", sdl_name);
             /* mark this sdl device as used */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-input-sdl.git