From 361bb23c27ddcbca9aa9dac4771a24f40798a619 Mon Sep 17 00:00:00 2001 From: mcmartin Date: Fri, 20 Jan 2006 00:51:08 +0000 Subject: [PATCH] VControl control schema version updated git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2205 8092fc87-c524-0410-9efc-e669fe64eaf9 --- sc2/ChangeLog | 1 + sc2/content/starcon.key | 4 ++-- sc2/src/sc2code/libs/input/sdl/input.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 073861c38..f73b96876 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.5: +- Control scheme upgrades checked (VControl Version upgrade) - Michael - Better instant-move (for debugging) - SvdB - Fixed version checking in unix build scripts. SDL 1.2.10 is now recognised as newer than 1.2.9. - SvdB diff --git a/sc2/content/starcon.key b/sc2/content/starcon.key index fe3bf1d14..24da3efc2 100644 --- a/sc2/content/starcon.key +++ b/sc2/content/starcon.key @@ -1,7 +1,7 @@ # Default UQM input configuration file. -# This is a VCONTROL version 1 config file (UQM 0.3 or later). -version 1 +# This is a VCONTROL version 2 config file (UQM 0.5 or later). +version 2 # Keyboard control definitions follow this point. Most keys can be # described in a straightforward manner; consult the name table in diff --git a/sc2/src/sc2code/libs/input/sdl/input.c b/sc2/src/sc2code/libs/input/sdl/input.c index 38423fbf4..346ded68c 100644 --- a/sc2/src/sc2code/libs/input/sdl/input.c +++ b/sc2/src/sc2code/libs/input/sdl/input.c @@ -38,7 +38,7 @@ static BOOLEAN InputInitialized = FALSE; static BOOLEAN _in_character_mode = FALSE; -#define VCONTROL_VERSION 1 +#define VCONTROL_VERSION 2 static VControl_NameBinding control_names[] = { { "Menu-Up", (int *)&ImmediateInputState.key[KEY_MENU_UP] },