Added version of ConfigInputs that doesn't take display dimensions

This commit is contained in:
Nik Henson 2011-06-28 23:16:40 +00:00
parent 9416f9c521
commit 0153a02b19
2 changed files with 16 additions and 4 deletions

View file

@ -289,13 +289,10 @@ void CInputs::WriteToINIFile(CINIFile *ini, const char *section)
(*it)->WriteToINIFile(ini, section);
}
bool CInputs::ConfigureInputs(const GameInfo *game, unsigned dispX, unsigned dispY, unsigned dispW, unsigned dispH)
bool CInputs::ConfigureInputs(const GameInfo *game)
{
m_system->UngrabMouse();
// Let the input system know the display geometry
m_system->SetDisplayGeom(dispX, dispY, dispW, dispH);
// Print header and help message
int gameFlags;
if (game != NULL)
@ -470,6 +467,14 @@ Redisplay:
return true;
}
bool CInputs::ConfigureInputs(const GameInfo *game, unsigned dispX, unsigned dispY, unsigned dispW, unsigned dispH)
{
// Let the input system know the display geometry
m_system->SetDisplayGeom(dispX, dispY, dispW, dispH);
return ConfigureInputs(game);
}
void CInputs::PrintInputs(const GameInfo *game)
{
// Print header

View file

@ -190,6 +190,13 @@ public:
* Configures the current input mapping assignments for the given game, or all inputs if game is NULL, by asking the user for input.
* Returns true if the inputs were configured okay or false if the user exited without requesting to save changes.
*/
bool ConfigureInputs(const GameInfo *game);
/*
* Configures the current input mapping assignments for the given game, or all inputs if game is NULL, by asking the user for input.
* Takes display geometry if this has not been set previously by a call to Poll().
* Returns true if the inputs were configured okay or false if the user exited without requesting to save changes.
*/
bool ConfigureInputs(const GameInfo *game, unsigned dispX, unsigned dispY, unsigned dispW, unsigned dispH);
/*