adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a problem where bad actions (MenuUp instead of Menu-Up) crashed

Browse Source 
during initKeyConfig.  The action-listener table needs to be
null-terminated.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1166 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2003-09-01 01:21:45 +00:00
parent 37ace65799
commit d8f537cd1b
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+2
View File
@@ -1,4 +1,6 @@
Changes towards version 0.3: Changes towards version 0.3:
- Action names are properly null-terminated, stops a crash for some
bad keys.cfg types -Michael
- added '--addon <addon>' - SvdB - added '--addon <addon>' - SvdB
- keys.cfg from incompatible control scheme version is now renamed - keys.cfg from incompatible control scheme version is now renamed
automatically to keys.old -Mika automatically to keys.old -Mika
sc2/src/sc2code/libs/input/sdl/input.c
+2 -1
View File
@@ -73,7 +73,8 @@ static VControl_NameBinding control_names[] = {
{ "Pause", (int *)&ImmediateInputState.pause }, { "Pause", (int *)&ImmediateInputState.pause },
{ "Exit", (int *)&ImmediateInputState.exit }, { "Exit", (int *)&ImmediateInputState.exit },
{ "Abort", (int *)&ImmediateInputState.abort }, { "Abort", (int *)&ImmediateInputState.abort },
{ "Debug", (int *)&ImmediateInputState.debug }}; { "Debug", (int *)&ImmediateInputState.debug },
{ "Illegal", NULL}};
static void static void
sc2/src/sc2code/libs/input/sdl/vcontrol.c
+1 -1
View File
@@ -1075,13 +1075,13 @@ _consume_idname (parse_state *state)
state->token[index] = 0; /* remove trailing colon */ state->token[index] = 0; /* remove trailing colon */
result = _name2target (state->token); result = _name2target (state->token);
_next_token (state);
if (!result) if (!result)
{ {
fprintf (stderr, "VControl: Illegal command type '%s' on config file line %d\n", state->token, state->linenum); fprintf (stderr, "VControl: Illegal command type '%s' on config file line %d\n", state->token, state->linenum);
state->error = 1; state->error = 1;
} }
_next_token (state);
return result; return result;
} }