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

mark readonly string parameter as const. Remove superflous 

protoype in keymap.c as the prototype from keymap.h is included.
Remove 2 commented out prototypes in keymap.h



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@742 4a71c877-e1ca-e34f-864e-861f7616d084
master
Stefan Huehner 2006-09-20 20:58:13 +00:00
parent bf2f8c5e8e
commit 1bd660ca36
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keymap.c
View File

@ -21,8 +21,6 @@
// ----------------------------------------------------------------------------------
/* Function Prototypes */
KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode,
KEY_ACTION action, void (*pKeyMapFunc)(void), STRING *name );
BOOL keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode );
BOOL keyRemoveMappingPt ( KEY_MAPPING *psToRemove );
KEY_MAPPING *keyFindMapping ( KEY_CODE metaCode, KEY_CODE subCode );
@ -491,7 +489,7 @@ void keyInitMappings( BOOL bForceDefaults )
/* Adds a new mapping to the list */
//BOOL keyAddMapping(KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action,void *function, STRING *name)
KEY_MAPPING *keyAddMapping(KEY_STATUS status,KEY_CODE metaCode, KEY_CODE subCode, KEY_ACTION action,
void (*pKeyMapFunc)(void), STRING *name)
void (*pKeyMapFunc)(void), const STRING *name)
{
KEY_MAPPING *newMapping;
BLOCK_HEAP *psHeap;

4
src/keymap.h
View File

@ -37,10 +37,8 @@ STRING *pName;
struct _keyMapping *psNext;
} KEY_MAPPING;
//extern BOOL keyAddMapping ( UDWORD functionId, KEY_CODE metaCode, KEY_CODE subCode );
//extern BOOL keyAddMapping ( KEY_CODE metaCode, KEY_CODE subcode, KEY_ACTION action, void *function, STRING *name );
extern KEY_MAPPING *keyAddMapping ( KEY_STATUS status, KEY_CODE metaCode, KEY_CODE subcode,
KEY_ACTION action, void (*pKeyMapFunc)(void), STRING *name );
KEY_ACTION action, void (*pKeyMapFunc)(void), const STRING *name );
extern BOOL keyRemoveMapping ( KEY_CODE metaCode, KEY_CODE subCode );
extern KEY_MAPPING *keyGetMappingFromFunction(void *function);
extern BOOL keyRemoveMappingPt ( KEY_MAPPING *psToRemove );