Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced NULL ptr with dummy kf_NOOP function so we don't crash on startup... 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2756 4a71c877-e1ca-e34f-864e-861f7616d084
master
Dennis Schridde 2007-11-08 23:01:13 +00:00
parent 9a06997527
commit b7daedee14
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/keymap.c
View File

@ -90,6 +90,8 @@ UDWORD numActiveMappings;
static KEY_CODE lastMetaKey,lastSubKey;
static BOOL bKeyProcessing = TRUE;
static void kf_NOOP(void) {}
// ----------------------------------------------------------------------------------
// Adding a mapped function ? add a save pointer! Thank AlexL.
// don't bugger around with the order either. new ones go at the end! DEBUG in debug section..
@ -225,7 +227,7 @@ _keymapsave keyMapSaveTable[] =
kf_AssignGrouping_0,
kf_SelectGrouping_0,
kf_SelectCommander_0,
NULL, // unused
kf_NOOP, // unused
kf_ToggleFogColour,
kf_AddMissionOffWorld,
kf_KillSelected,
@ -442,7 +444,7 @@ void keyInitMappings( BOOL bForceDefaults )
keyAddMapping(KEYMAP__DEBUG,KEY_IGNORE,KEY_K,KEYMAP_PRESSED,kf_TriFlip, "Flip terrain triangle");
//These ones are necessary for debugging
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_A,KEYMAP_PRESSED,kf_AllAvailable, "Make all items available");
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_A,KEYMAP_PRESSED,kf_AllAvailable, "Make all items available");
keyAddMapping(KEYMAP__DEBUG,KEY_LALT,KEY_K,KEYMAP_PRESSED,kf_KillSelected, "Kill Selected Unit(s)");
keyAddMapping(KEYMAP__DEBUG,KEY_LCTRL,KEY_G,KEYMAP_PRESSED,kf_ToggleGodMode, "Toggle god Mode Status");
keyAddMapping(KEYMAP__DEBUG,KEY_LCTRL,KEY_O,KEYMAP_PRESSED,kf_ChooseOptions, "Display Options Screen");
@ -841,7 +843,7 @@ SDWORD i;
case KEY_LSHIFT:
case KEY_RSHIFT:
continue;
break;
break;
}
/* Let scripts process this key if it's pressed */