zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 17:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix warning from r3128

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3133 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2012-11-08 22:09:00 +00:00
parent 61f79336d6
commit a4311f5cb1
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
polymer/eduke32/source/config.c
View file

@ -145,10 +145,9 @@ const char *CONFIG_AnalogNumToName(int32_t func)
===================
*/
void CONFIG_SetDefaultKeys(int32_t type)
void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN])
{
int32_t i,f;
const char (*keyptr)[MAXGAMEFUNCLEN] = type ? oldkeydefaults : keydefaults;
Bmemset(ud.config.KeyboardKeys, 0xff, sizeof(ud.config.KeyboardKeys));
@ -271,7 +270,7 @@ void CONFIG_SetDefaults(void)
// JBF 20031211
CONFIG_SetDefaultKeys(0);
CONFIG_SetDefaultKeys((const char (*)[MAXGAMEFUNCLEN])keydefaults);
memset(ud.config.MouseFunctions, -1, sizeof(ud.config.MouseFunctions));
for (i=0; i<MAXMOUSEBUTTONS; i++)

2
polymer/eduke32/source/config.h
View file

@ -30,7 +30,7 @@ void CONFIG_GetSetupFilename( void );
void CONFIG_WriteSetup(uint32_t flags);
void CONFIG_SetupMouse( void );
void CONFIG_SetupJoystick( void );
void CONFIG_SetDefaultKeys(int32_t type);
void CONFIG_SetDefaultKeys(const char (*keyptr)[MAXGAMEFUNCLEN]);
int32_t CONFIG_GetMapBestTime(char *mapname);
int32_t CONFIG_SetMapBestTime(char *mapname, int32_t tm);

4
polymer/eduke32/source/menus.c
View file

@ -3679,12 +3679,12 @@ cheat_for_port_credits2:
}
else if (x == NUMGAMEFUNCTIONS)
{
CONFIG_SetDefaultKeys(0);
CONFIG_SetDefaultKeys((const char (*)[MAXGAMEFUNCLEN])keydefaults);
break;
}
else if (x == NUMGAMEFUNCTIONS+1)
{
CONFIG_SetDefaultKeys(1);
CONFIG_SetDefaultKeys(oldkeydefaults);
break;
}
else if (x>=0)