fixed merge bug (fixes #758)

This commit is contained in:
thrust26 2021-01-26 13:18:14 +01:00
parent 0a0b014c13
commit 1bb126b06a
1 changed files with 1 additions and 1 deletions

View File

@ -283,7 +283,7 @@ void GameInfoDialog::addControllersTab()
VarList::push_back(items, "KidVid", "KIDVID"); VarList::push_back(items, "KidVid", "KIDVID");
VarList::push_back(items, "Lightgun", "LIGHTGUN"); VarList::push_back(items, "Lightgun", "LIGHTGUN");
VarList::push_back(items, "MindLink", "MINDLINK"); VarList::push_back(items, "MindLink", "MINDLINK");
VarList::push_back(ctrls, "QuadTari", "QUADTARI"); VarList::push_back(items, "QuadTari", "QUADTARI");
xpos = HBORDER; ypos = VBORDER; xpos = HBORDER; ypos = VBORDER;
pwidth = _font.getStringWidth("Paddles_IAxis"); pwidth = _font.getStringWidth("Paddles_IAxis");