travis build failure on 1 of 7 configurations
This commit is contained in:
+2
-2
@@ -683,7 +683,7 @@ NetHackQtMainWindow::NetHackQtMainWindow(NetHackQtKeyBuffer& ks) :
|
|||||||
QToolButton* tb;
|
QToolButton* tb;
|
||||||
char actchar[32];
|
char actchar[32];
|
||||||
tb = new SmallToolButton( QPixmap(again_xpm),"Again","Action", sm, SLOT(map()), toolbar );
|
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 );
|
sm->setMapping(tb, actchar );
|
||||||
toolbar->addWidget(tb);
|
toolbar->addWidget(tb);
|
||||||
tb = new SmallToolButton( QPixmap(get_xpm),"Get","Action", sm, SLOT(map()), toolbar );
|
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 )
|
event->key() >= Qt::Key_Left && event->key() <= Qt::Key_Down )
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const char* d = Cmd.dirchars;
|
const char* d = g.Cmd.dirchars;
|
||||||
switch (event->key()) {
|
switch (event->key()) {
|
||||||
case Qt::Key_Up:
|
case Qt::Key_Up:
|
||||||
if ( dirkey == d[0] )
|
if ( dirkey == d[0] )
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ char NetHackQtYnDialog::Exec()
|
|||||||
}
|
}
|
||||||
if ( question.indexOf("what direction") >= 0 ) {
|
if ( question.indexOf("what direction") >= 0 ) {
|
||||||
// We replace this regardless, since sometimes you get choices.
|
// We replace this regardless, since sometimes you get choices.
|
||||||
const char* d = Cmd.dirchars;
|
const char* d = g.Cmd.dirchars;
|
||||||
enable=ch;
|
enable=ch;
|
||||||
ch="";
|
ch="";
|
||||||
ch.append(d[1]);
|
ch.append(d[1]);
|
||||||
|
|||||||
Reference in New Issue
Block a user