From: nhmall Date: Fri, 6 Dec 2019 01:46:13 +0000 (-0500) Subject: travis build failure on 1 of 7 configurations X-Git-Tag: NetHack-3.7.0_WIP~151 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cb20548d175e3324d81a99c8edd9a70b57553f24;p=nethack travis build failure on 1 of 7 configurations --- diff --git a/win/Qt4/qt4main.cpp b/win/Qt4/qt4main.cpp index 291bddc35..694415b24 100644 --- a/win/Qt4/qt4main.cpp +++ b/win/Qt4/qt4main.cpp @@ -683,7 +683,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) : QToolButton* tb; char actchar[32]; tb = new SmallToolButton( QPixmap(again_xpm),"Again","Action", sm, SLOT(map()), toolbar ); - Sprintf(actchar, "%c", Cmd.spkeys[NHKF_DOAGAIN]); + Sprintf(actchar, "%c", g.Cmd.spkeys[NHKF_DOAGAIN]); sm->setMapping(tb, actchar ); toolbar->addWidget(tb); tb = new SmallToolButton( QPixmap(get_xpm),"Get","Action", sm, SLOT(map()), toolbar ); @@ -977,7 +977,7 @@ void NetHackQtMainWindow::keyPressEvent(QKeyEvent* event) event->key() >= Qt::Key_Left && event->key() <= Qt::Key_Down ) return; - const char* d = Cmd.dirchars; + const char* d = g.Cmd.dirchars; switch (event->key()) { case Qt::Key_Up: if ( dirkey == d[0] ) diff --git a/win/Qt4/qt4yndlg.cpp b/win/Qt4/qt4yndlg.cpp index e315189de..7b1725924 100644 --- a/win/Qt4/qt4yndlg.cpp +++ b/win/Qt4/qt4yndlg.cpp @@ -81,7 +81,7 @@ char NetHackQtYnDialog::Exec() } if ( question.indexOf("what direction") >= 0 ) { // We replace this regardless, since sometimes you get choices. - const char* d = Cmd.dirchars; + const char* d = g.Cmd.dirchars; enable=ch; ch=""; ch.append(d[1]);