- more cleanup

Moving init code and key binding getter to backend
This commit is contained in:
Christoph Oelckers 2019-10-28 07:05:32 +01:00
parent 4f4fc1a8d4
commit 901b86577e
10 changed files with 49 additions and 125 deletions

View file

@ -1128,35 +1128,6 @@ void CON_MultiNameChange(void)
void CON_LoadSetup(void)
{
/*
char base[80],command[80];
// Format: showuser [SpriteNum]
if (sscanf(MessageInputString,"%s %s",base,command) < 2)
{
strcpy(MessageInputString,"help config");
CON_GetHelp();
return;
}
if (!SafeFileExists(command))
{
CON_ConMessage("CON_LoadSetup: %s does not exist.",command);
return;
} else
{
strcpy(setupfilename,command);
}
initkeys();
CONFIG_ReadSetup();
if (CONTROL_JoystickEnabled)
{
CONTROL_CenterJoystick(CenterCenter, UpperLeft, LowerRight, CenterThrottle,
CenterRudder);
}
CON_ConMessage("Loaded new config file.");
*/
CON_ConMessage("JonoF: Maybe later");
}
@ -1194,8 +1165,6 @@ void CON_DamageData(void)
char base[80],field[80];
int16_t op1=0;
unsigned int op2, i;
SPRITEp sp;
USERp u;
// Format: damage [field] [item] [value]
if (sscanf(MessageInputString,"%s %s %hd %u",base,field,&op1,&op2) < 3)

View file

@ -87,27 +87,8 @@ int32_t GetTime(void)
void InitSetup(void)
{
int i;
//RegisterShutdownFunction( ShutDown );
//StartWindows();
//initkeys();
//CONFIG_GetSetupFilename();
//InitializeKeyDefList();
//CONFIG_ReadSetup();
CONFIG_SetupMouse();
CONFIG_SetupJoystick();
CONTROL_JoystickEnabled = (UseJoystick && CONTROL_JoyPresent);
CONTROL_MouseEnabled = (UseMouse && CONTROL_MousePresent);
/*{
int i;
CONTROL_PrintKeyMap();
for(i=0;i<NUMGAMEFUNCTIONS;i++) CONTROL_PrintControlFlag(i);
CONTROL_PrintAxes();
}*/
}
#if 0